Updated POT file.

75 files changed, 45081 insertions, 65185 deletions

diff --git a/po/Makefile b/po/Makefile
index cdcea7d7..7017e0f9 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -37,7 +37,7 @@ merge: $(PGOAL).pot
 $(PGOAL).pot: $(PL_FILES) $(CFILES)
 	INTLTOOL_EXTRACT=./intltool-extract ./intltool-update --gettext-package desktopstuff --pot
 	xgettext -F -n --add-comments \
-	  --keyword=N_ --keyword=N \
+	  --keyword=N_ --keyword=N --from-code=utf-8 \
 	  --language=Perl -o $(PGOAL)_tmp.pot $(PL_FILES)
 	xgettext -F -n --add-comments='-PO' \
 		--keyword=_ --keyword=__ --keyword=N_ --keyword=N \
diff --git a/po/af.po b/po/af.po
index 08af5a9f..8b1ab847 100644
--- a/po/af.po
+++ b/po/af.po
@@ -11,7 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-af\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2003-09-24 10:22+0200\n"
 "Last-Translator: Dirk van der Walt <mandrake@webmail.co.za>\n"
 "Language-Team: Afrikaans\n"
@@ -20,13 +21,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -40,18 +39,17 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:85
+#, fuzzy
 msgid "Official updates"
 msgstr "Normale opdaterings"
 
-#: ../edit-urpm-sources.pl:87
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:88
+#, fuzzy, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -66,106 +64,89 @@ msgstr ""
 "\n"
 "Kan ons voortgaan?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Net 'n oomblik, media word vervris..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Voeg media by"
 
 #
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Plaaslike lêers"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Pad:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP bediener"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "FTP bediener"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP bediener"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Verwyderbare media"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Pad of hegpunt:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Verwyderbare media"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Soek..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Inteken:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relatiewe pad na die synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 "Indien weggelaat, sal gepoog word om self die 'synthesis/hdlist' te vind"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Naam:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Kies die media wat u wil opdateer:"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "U moet minstens die eertse twee velde invul."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -173,13 +154,11 @@ msgstr ""
 "Daar is alreeds 'n media met daardie naam, wil \n"
 "u dit inderdaad vervang?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Voeg 'n media by:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tipes media:"
 
@@ -187,10 +166,9 @@ msgstr "Tipes media:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Kanselleer"
 
@@ -199,45 +177,44 @@ msgstr "Kanselleer"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Ok"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Installasievoorbereiding..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, fuzzy, c-format
+#, fuzzy
 msgid "never"
 msgstr "Bedieners"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Aflaai van '%s', spoed: %s"
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Verwyder Sagteware"
 
 #: ../edit-urpm-sources.pl:352
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 "Wil u werklik die sleutel %s vanaf media %s verwyder?\n"
@@ -245,58 +222,49 @@ msgstr ""
 
 #
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Net 'n oomblik, verwyder media..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Redigeer 'n media"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Redigeer media \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Stoor veranderinge"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Instaanbediener..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Plaas eers die media, om voort te kan gaan"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Om die veranderinge te stoor, moet u die media in die aandrywer plaas."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Konfigureer instaanbedieners"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -305,169 +273,140 @@ msgstr ""
 "( sintaks: <instaanbediener[:poort]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Instaanbediener se naam:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "U mag 'n gebuikersnaam/wagwoord spesifiseer by die instaanbediener:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Gebruiker:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Voeg 'n parallelle groep by"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Redigeer 'n parallelle groep"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Voeg 'n media limiet by"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Kies 'n media wat die limiet sal byvoeg:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Voeg rekenaar by"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Voorsien die rekenaarnaam of IP adres om by te voeg:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redigeer parallelle groep \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Groepnaam"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Media limiet:"
 
 #
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Voeg by"
 
 #
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Verwyder"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Rekenaars:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Stel parallelle urpmi op (verspreide uitvoer van urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Groep"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Media limiet"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Opdrag"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Redigeer..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Voeg by..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Beheer sleutels vir die digitale stempels van pakkette"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Media"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "die rpm sleutelhouer huisves nie hierdie sleutel nie!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Voeg sleutel by"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Kies 'n sleutel om by die media %s te voeg"
 
 #
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Verwyder 'n sleutel"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -476,76 +415,66 @@ msgstr ""
 "(sleutelnaam: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Voeg sleutel by..."
 
 #
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Verwyder sleutel"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Konfigureer media"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Aktiveer?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Opgradeer"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "Voeg by..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Opgradeer..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Sleutelbeheer..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parallel..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Hulp"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -555,8 +484,7 @@ msgstr ""
 "\n"
 "Kan ons voortgaan?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -570,8 +498,7 @@ msgstr ""
 "rekenaar. Hulle sal dan tot beskikking wees vir die installasie van nuwe\n"
 "sagteware of om die hudige sagteware op te gradeer."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -579,102 +506,100 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
 "to your system from that new medium."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, perl-format
+msgid "Successfully added media %s."
+msgstr ""
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Gebruik: %s [OPSIES]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Loop in gebruikermodus"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -684,638 +609,524 @@ msgstr ""
 "Alhoewel u steeds in die bestaande databasis kan rondblaai\n"
 " sal u nie instaat wees om veranderinge te maak nie."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Toeganklikheid"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Data Wegbêre"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Rugsteun"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Skryf van CDs"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Saampers"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Ander"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Boeke"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Rekenaarboeke"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Neulvrae"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Vertel my"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Letterkunde"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Kommunikasie"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Databasisse"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Ontwikkeling"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Ontwikkeling"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME en GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE en Qt"
 
 #
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Redigeerders"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Opvoeding"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Nastrewers"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Nutsprogramme vir lêers"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Speletjies"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Avontuur"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Speletjies"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Bordspel"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kaarte"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Legkaarte"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategie"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Grafiese gebruikskoppelvlak"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Grafiese gebruikskoppelvlak"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM gebaseer"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitor"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "multimedia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Netwerk"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Klets"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Netwerk"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Lêeroordrag"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Kitsboodskappe"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "e-Pos"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Nuus"
 
 #
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Eksterne toegang"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Kantoor"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publisering"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Wetenskappe"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Sterrekunde"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Wetenskappe"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chemie"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Rekenaarswetenskap"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geowetenskap"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Wiskunde"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fisika"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Aantekentolke"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Klank"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Rekenaar"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Basis"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfigurasie"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Rekenaar"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Selflaai en Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigurasie"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardeware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Verpakking"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Drukkers"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Ontwikkeling"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Ontwikkeling"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Lettertipes"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Instruksielyn"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Lettertipes"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "Egte Tipe"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Tipe1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internasionalisering"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel en hardeware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Programmateke"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Bedieners"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminale"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Teksverwante Nutsprogramme "
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Speelgoeters"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Onbeskikbaar)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Soekverslag"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Soekverslag (none)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Net 'n oomblik, besig met soektog...."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Staak"
+#
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Byvoegbaar"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Opgradeerbaar"
 
-#
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Byvoegbaar"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Nie gekies nie"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Gekose"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Nie gekies nie"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Belangrikhied: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Rede om op te dateer:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "in beskrywings"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Lêers:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Veranderingestaaflêer:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Media: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Tans geïnstalleer: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Weergawe: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Grootte: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Belangrikhied: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Grootte: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Opsomming: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Rede om op te dateer:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Beskrywing: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "in beskrywings"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Meer inligting rakende pakket..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Kies asseblief"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Een van die volgende pakkette word benodig:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Kies asseblief"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Net 'n oomblik, skep 'n lys van pakkette"
 
 #
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Geen opdatering"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1325,29 +1136,24 @@ msgstr ""
 "opgradering pakkette beskikbaar vir die tans op u rekenaar\n"
 "óf u het alreeds hulle almal geïnstalleer."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Alles"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Meer inligting"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Inligting rakende pakkette"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Addisionele pakkette moet ook verwyder word"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1357,13 +1163,11 @@ msgstr ""
 "pakket(te) verwyder word:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Sommige pakkette kan nie verwyder word nie"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1371,8 +1175,7 @@ msgstr ""
 "Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1382,13 +1185,11 @@ msgstr ""
 "nie gekies word nie:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Addisionele pakkette word benodig"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1398,18 +1199,17 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1419,124 +1219,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Somige pakette sal moet verwyder word"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Gekies: %d MB / Oop skyfspasie: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Gekose pakkette: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Sekuriteitsopgraderings"
+#: ../rpmdrake:1003
+msgid "Installed"
+msgstr "Geïnstalleer"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Foutkorreksiegraderings"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Moenie installeer nie"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normale opdaterings"
-
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux keuses"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Alle pakette, alfabeties"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Alle pakkette, volgens groep"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Alle pakkette, volgens beskikbare opgraderings"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Alle pakkette, volgens grootte"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Alle pakette, volgens wie gekies is"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Alle pakette, volgens mediabron"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Alle pakkette, volgens beskikbare opgraderings"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Slegs eindpunte, gesorteer volgens installasiedatums"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Alle pakkette, volgens groep"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normale opdaterings"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Foutkorreksiegraderings"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normale opdaterings"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Sekuriteitsopgraderings"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "in name"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "in beskrywings"
 
 #
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "in lêername"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Standaard inligting"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Alle inligting"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Kies eers u pakkette."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "U het te veel pakette gekies"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1552,7 +1336,7 @@ msgstr ""
 "Wil u voortgaan met die installasie?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1566,90 +1350,106 @@ msgstr ""
 "\n"
 "Kan ons voort gaan?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Lêer"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Dateer media op"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Kies weer oor"
 
-#: ../rpmdrake:1177
-#, fuzzy, c-format
+#: ../rpmdrake:1173
+#, fuzzy
 msgid "/Reload the _packages list"
 msgstr "Herlaai die lys van pakkette"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Verlaat"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Opsies"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, fuzzy, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
+#, fuzzy
 msgid "/_Show automatically selected packages"
 msgstr "Wys outogeselekteerde pakkette."
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+#, fuzzy
+msgid "/_About..."
+msgstr "/Hulp/_Aangaande..."
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Opdaterings"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Soek:"
 
 #
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Soek"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Maak skoon"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installeer"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr "Toepas"
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Verlaat"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Ernstige fout"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "'n Ernstige fout het voorgekom: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1661,13 +1461,12 @@ msgstr ""
 "\n"
 "Kan ons voortgaan?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Reeds bestaande opdateringsmedia"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1682,13 +1481,12 @@ msgstr ""
 "\n"
 "Herbegin net %s daarna."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Hoe om self u spieëlwebplek te kies"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1702,59 +1500,57 @@ msgstr ""
 "\n"
 "Herbegin net %s daarna."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Net 'n oomblik, opsoek na beskikbare pakette..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Net 'n oomblik, lees die pakketdatabasis...."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Ondersoek %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "veranderinge:"
 
 #
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Verwyder .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Gebruik %s as die hooflêer"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Moet niks doen nie"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Geïnstalleer"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Beskou..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Al die gekose pakette het korrek geïnstalleer."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Daar was probleme tydens installasie"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1764,18 +1560,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Kan nie die bronpakette bekom nie."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Jammer, kan nie die bronpakette bekom nie. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1787,38 +1582,34 @@ msgstr ""
 "Fout(e) wat voorgekom het:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Installasievoorbereiding..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Aanvangstadium..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Installasievoorbereiding..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Verander media"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laai tans pakket '%s' (%s/%s) af ..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Bevestig pakket stempels...."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1832,13 +1623,12 @@ msgstr ""
 "\n"
 "Wil u hulle steeds installeer?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "onsuksesvolle installasie"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1850,23 +1640,22 @@ msgstr ""
 "\n"
 "Probeer u media se databasis opdateer."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Installasievoorbereiding..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installeer pakket '%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1878,44 +1667,34 @@ msgstr ""
 "Sommige konfigurasielêers is geskep as '.rpmnew' of '.rpmsave',\n"
 "om verdere besluite te neem, kan u hulle nou van nader beskou:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1722
-#, fuzzy, c-format
+#: ../rpmdrake:1819
+#, fuzzy, perl-format
 msgid "More information on package... [%s]"
 msgstr "Meer inligting rakende pakket..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Geen pakket kon vir die installasie gevind word nie."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Ernstige fout: kon nie die pakket wat ons moet installeer vind nie, jammer."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Net 'n oomblik, lees die pakketdatabasis...."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Net 'n oomblik, verwyder sagteware..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Daar was probleme tydens die verwydering"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1925,8 +1704,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1938,8 +1716,8 @@ msgstr ""
 "Hierdie nutsprogram sal u help om die programme\n"
 "te kies wat u wil verwyder."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1951,13 +1729,11 @@ msgstr ""
 "Hiedie nutsprogram sal u help om die pakkette te kies\n"
 "wat u wil opgradeer."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1971,214 +1747,177 @@ msgstr ""
 "beskikking op CDROM of DVD. Hierdie nutsprogram kan u help met\n"
 "die keuses asook die installasie daarvan."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Verwyder Sagteware"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Opdaterings"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Verwyder Sagteware"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Voorsien asseblief u e-posadres"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Gebruikerskode:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Verwyder Sagteware"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Verwyder Sagteware"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Sagteware Installering"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nee"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Inligting..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Australië"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australië"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "België"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasilië"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Switserland"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Tsjeggiese Republiek"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Duitsland"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Denemarke"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Griekeland"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spanje"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Frankryk"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hongarye"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italië"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norweë"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Pole"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Swede"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapoer"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakye"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Verenigde Koninkryk"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Verenigde State"
 
-#: ../rpmdrake.pm:505
-#, fuzzy, c-format
+#: ../rpmdrake.pm:518
+#, fuzzy
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2190,8 +1929,7 @@ msgstr ""
 "\n"
 "Kan ons voortgaan?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2203,23 +1941,27 @@ msgstr ""
 "\n"
 "Kan ons voortgaan?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr " Spieëls"
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr "Net 'n oomblik, laai die spieëlplekke se adresse van Mandriva af."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Net 'n oomblik, laai die spieëlplekke se adresse van Mandriva af."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Probleme gedurende die aflaai"
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2233,8 +1975,8 @@ msgstr ""
 "Of die network, of Mandriva se webwerf is moonlik onbeskikbaar.\n"
 "Probeer asseblief weer later."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2248,18 +1990,15 @@ msgstr ""
 "Of die network, of Mandriva se webwerf is moonlik onbeskikbaar.\n"
 "Probeer asseblief weer later."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Geen spieëlwebplekke"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2273,70 +2012,65 @@ msgstr ""
 "is waneer die argitektuur van u verwerker nie ondersteun word deur\n"
 "'Mandriva Linux Official Updates' nie."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Kies asseblief 'n spieëlwebplek."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Ondersoek medialêer '%s'....."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ondersoek die afgeleë medialêer '%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr "voltooi."
 
 #
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " gefaal!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s from media %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Begin die aflaai van '%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Aflaai van '%s',tyd gelede:%s, spoed: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Aflaai van '%s', spoed: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Net 'n oomblik, media word vervris..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2346,36 +2080,32 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Dateer media op"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Kies die media wat u wil opdateer:"
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr ""
 "Kies\n"
 "almal"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Opgradeer"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2387,27 +2117,26 @@ msgstr ""
 "Foute:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Probleme met skep van media."
 
 #
-#: ../rpmdrake.pm:819
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "Net 'n oomblik, Voeg media by..."
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2417,29 +2146,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Die hulpprogram is afgeskop in die agtergrond"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2715,6 +2442,21 @@ msgstr "Verwyder Sagteware"
 msgid "Software Media Manager"
 msgstr "Software Media Manager"
 
+#~ msgid "Stop"
+#~ msgstr "Staak"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Alle pakette, volgens mediabron"
+
+#~ msgid "Normal information"
+#~ msgstr "Standaard inligting"
+
+#~ msgid "Maximum information"
+#~ msgstr "Alle inligting"
+
+#~ msgid "Install"
+#~ msgstr "Installeer"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "Alles is korrek geïnstalleer"
 
@@ -2772,9 +2514,6 @@ msgstr "Software Media Manager"
 #~ msgid "Preparing for install"
 #~ msgstr "Installasievoorbereiding"
 
-#~ msgid "Don't install"
-#~ msgstr "Moenie installeer nie"
-
 #~ msgid "Signature problem"
 #~ msgstr "Ondertekeningsprobleem"
 
@@ -2920,12 +2659,6 @@ msgstr "Software Media Manager"
 #~ msgid "/File/_Quit"
 #~ msgstr "/Lêer/_Verlaat"
 
-#~ msgid "/Help/_About..."
-#~ msgstr "/Hulp/_Aangaande..."
-
-#~ msgid "Installed"
-#~ msgstr "Geïnstalleer"
-
 #~ msgid "Source on network: (random mirror)\n"
 #~ msgstr "Bron op netwerk: (lukrake spieël)\n"
 
@@ -3055,9 +2788,6 @@ msgstr "Software Media Manager"
 #~ msgid "Current Mirror:"
 #~ msgstr "Huidige Spieël:"
 
-#~ msgid " Mirrors "
-#~ msgstr " Spieëls"
-
 #~ msgid "%d packages have been added to the list of packages to install"
 #~ msgstr "%d pakkette is by die pakketinstallasielys gevoeg."
 
@@ -3106,9 +2836,6 @@ msgstr "Software Media Manager"
 #~ msgid "OK"
 #~ msgstr "OK"
 
-#~ msgid "Apply"
-#~ msgstr "Toepas"
-
 #~ msgid ""
 #~ "\n"
 #~ "Importance: %s\n"
diff --git a/po/am.po b/po/am.po
index b3a7d0e1..5e568495 100644
--- a/po/am.po
+++ b/po/am.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2004-04-19 13:59+0200\n"
 "Last-Translator: Alemayehu Gemeda <alemayehu@gmx.at>\n"
 "Language-Team: Amharic <LL@li.org>\n"
@@ -13,13 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -33,18 +32,16 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -55,116 +52,95 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "የቅርብ ፋይሎች"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "መተላለፊያ፦"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "የFTP ተጠሪ"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL፦"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "የFTP ተጠሪ"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
+#: ../edit-urpm-sources.pl:136
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Path or mount point:"
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "ቃኝ..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "ዝምብሎ ይግባ:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "ሚስጢራዊ ቃል"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "ስም፦"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr ""
 
@@ -172,10 +148,9 @@ msgstr ""
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "ተወው"
 
@@ -184,350 +159,294 @@ msgstr "ተወው"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "እሺ"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "ሁል ጊዜ"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "በፍጹም"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "ለውጦች አስቀምጣቸው"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "ተጠቃሚ፦"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "ፕሮቶኮል:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "ጨምር"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "አስወግድ"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "የውይይት መድረክ"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
+msgid "Media limit"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Media limit"
+msgid "Protocol"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "ትእዛዝ"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(ምንም)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "አስተካክል"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "ጨምር..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "መሀከለኛ"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "አሻሽል"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "መረጃ"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -536,8 +455,7 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -545,939 +463,797 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
 "to your system from that new medium."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, perl-format
+msgid "Successfully added media %s."
+msgstr ""
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "አጠቃቀም፦ %s [ምርጫ]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "የመገኘት ሁኔታ"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "መዝገብ ቤት"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "ቤካፕ"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "ሲዲ ማቃጠል"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "መጠቅጠቅ"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "ሌላ"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr ""
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "መገናኛዎች"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "ዳታቤዝ"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "እድገት"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "እድገት"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr ""
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr ""
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr ""
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "አርትኢዎች"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "ትምህርት"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "ተስተካካዮች"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "የፋይል መሳሪያዎች"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "ጨዋታዎች"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "አደገኛ ሁኔታ"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "ጨዋታዎች"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "አርኬድ"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "ቦርዶች"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "ካርዶች"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "እንቆቅልሾች"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "ስፖርት"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "እቅድ"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
+#: ../rpmdrake:235
+msgid "Enlightenment"
 msgstr ""
 
-#: ../rpmdrake:224
-#, c-format
-msgid "Enlightenment"
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
 msgstr ""
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "ኖም"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr ""
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "ንድፍ"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "መቆጣጠር"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "የመገናኛ ብዙሃን"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "መረብ"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "ውይይት"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "መረብ"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "ፋይል ማዛወር"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "ፈጣን መልእክት"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "ፖስታ"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "ዜና"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "በርቀት ማየት "
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "ቢሮ"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "ማሳተም"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "ሳይንስ"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "የፈለክ ጥናት"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "ሳይንስ"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "ባዮሎጂ"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "ኬሚስትሪ"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "ኮምፒውተር ሳይንስ"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "የስነ-ምድር ሳይንስ"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "ሂሳብ"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "ፊዚክስ"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "ሼሎች"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "ድምፅ"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "ሲስተም"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "ማስተካከያ"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "ሲስተም"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "ማስጀመሪያ"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "ማስተካከያ"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "ሀርድዌር"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr ""
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "ህትመት"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "እድገት"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "እድገት"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "የፊደል ቅርጾች"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr ""
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "የፊደል ቅርጾች"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "ሰርቨሮች"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr ""
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "ተርሚናሎች"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "የመጻፊያ መሳሪያዎች"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "አሻንጉሊቶች"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "ቪዲዮ"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr ""
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr ""
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "አቁም"
-
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
+#: ../rpmdrake:531
+msgid "Not selected"
 msgstr ""
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "ተመርጠዋል"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "አስፈላጊነት: "
+
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:553
-#, c-format
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "መግለጫ: "
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr ""
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "ስም: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "ዝርያ: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "መጠን: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "አስፈላጊነት: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "መጠን: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "ማጠቃለያ፦"
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr ""
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "መግለጫ: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "መግለጫ: "
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr ""
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
+#: ../rpmdrake:672
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:618
-#, c-format
-msgid "One of the following packages is needed:"
+#: ../rpmdrake:672
+msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr ""
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr ""
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means 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:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "ሁሉንም"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr ""
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr ""
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr ""
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "ትከል"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr ""
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "ትከል"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr ""
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
+#: ../rpmdrake:1010
+msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
+#: ../rpmdrake:1011
+msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:982
-#, c-format
-msgid "Leaves only, sorted by install date"
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "አሻሽል"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
-msgid "in names"
+#: ../rpmdrake:1013
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:1059
-#, c-format
-msgid "in descriptions"
+#: ../rpmdrake:1013
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake:1061
-#, c-format
-msgid "in file names"
+#: ../rpmdrake:1068
+msgid "in names"
 msgstr ""
 
 #: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
+msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
+#: ../rpmdrake:1072
+msgid "in file names"
 msgstr ""
 
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr ""
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr ""
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1488,7 +1264,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1497,89 +1273,100 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/ፋይል (_F)"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr ""
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "የመንገድ ምርጫ"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr ""
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/ውጣ (_Q)"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<ኮንትሮል>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/ምርጫዎች (_O)"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/መረጃ (_H)"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+msgid "Mandriva Linux"
+msgstr ""
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "ፈልግ፦"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "ፈልግ..."
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "አጥፋ"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "ትከል"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "ውጣ"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr ""
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1587,13 +1374,12 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr ""
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1603,13 +1389,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1618,76 +1403,73 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr ""
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr ""
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr ""
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr ""
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1695,38 +1477,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
+#: ../rpmdrake:1664
+msgid "Initializing..."
 msgstr ""
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Initializing..."
+#: ../rpmdrake:1664
+msgid "Package installation..."
 msgstr ""
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1735,13 +1513,13 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, fuzzy, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
+#, fuzzy
 msgid "Installation failed"
 msgstr "%s አልተገኘም"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1749,23 +1527,21 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr ""
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1773,51 +1549,40 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr ""
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr ""
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr ""
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1825,8 +1590,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1834,13 +1599,11 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1849,214 +1612,174 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
+#: ../rpmdrake.pm:102
+msgid "Mandriva Linux Update"
 msgstr ""
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Mandriva Linux Update"
+#: ../rpmdrake.pm:102
+msgid "Software Update"
 msgstr ""
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "እባክዎ ለ%s@%s እንደገና ሚስጢራዊ ቃልዎን ይስጡ:"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "የተጠቃሚ ስም"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr ""
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr ""
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr ""
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "አይ"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "አዎ"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "ኦስትሪያ"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "አውስትሬሊያ"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "ቤልጄም"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "ብራዚል"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "ካናዳ"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "ስዊዘርላንድ"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "ኮስታሪካ"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "ቼክ ሪፑብሊክ"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "ጀርመን"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "ግሪክ"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "ስፔን"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "ፊንላንድ"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "ፈረንሳይ"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "ሀንጋሪ"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "እስራኤል"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "ጣሊያን"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "ጃፓን"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "ኮሪያ ሪፐብሊክ"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "ኔዘርላንድ"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "ኖርዌይ"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "ፖላንድ"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "ፖርቱጋል"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "ራሺያ"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "ስዊድን"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "ሲንጋፖር"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "ስሎቫኪያ"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "ታይዋን"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "እንግሊዝ"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "ቻይና"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "አሜሪካ"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2064,8 +1787,7 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2073,23 +1795,25 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2098,8 +1822,8 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2108,18 +1832,15 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr ""
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2128,69 +1849,65 @@ msgid ""
 "by Mandriva Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:628
-#, fuzzy, c-format
+#: ../rpmdrake.pm:644
+#, fuzzy
 msgid " done."
 msgstr "ጨርሷል"
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr ""
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr ""
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2200,34 +1917,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr ""
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr ""
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "ሁሉንም ምረጡ"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "አሻሽል"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2235,55 +1947,51 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2558,5 +2266,8 @@ msgstr ""
 msgid "Software Media Manager"
 msgstr ""
 
+#~ msgid "Stop"
+#~ msgstr "አቁም"
+
 #~ msgid "/_View"
 #~ msgstr "/ተመልከት (_V)"
diff --git a/po/ar.po b/po/ar.po
index 99587788..5a2df184 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-02-24 23:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -16,13 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "اختيار نوع الوسط"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -43,18 +42,16 @@ msgstr ""
 "التحديثات الرسميّة لتوزيعتك. (يمكنك إضافة كلتاها، ولكن سيتوجب عليك\n"
 "عمل ذلك بخطوتين)."
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "مصادر التوزيعة"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "تحديثات رسميّة"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -72,116 +69,96 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "انتظر من فضلك، جاري إضافة الوسائط..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "أضف وسيط"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "ملفات محلية"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "المسار:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "خادم FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "العنوان:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "خادم FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "خادم HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "الأجهزة القابلة للإزالة"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "المسار أو نقطة التحميل:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "الأجهزة القابلة للإزالة"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "استعرض..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "اسم الدخول:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "المسار الى ملف التخليق أو hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "اذا تم تركه فارغاً سيتم البحث عن synthesis/hdlist تلقائياً"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "الإسم:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "إنشاء وسط لتوزيعة كاملة"
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "اختر الوسائط التي تريد تحديثها:"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr "هناك وسيط بهذا الإسم مسبقاً، هل تريد استبداله فعلاً؟"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "جاري اضافة وسيط"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "نوع الوسط:"
 
@@ -189,10 +166,9 @@ msgstr "نوع الوسط:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "الغاء"
 
@@ -201,101 +177,86 @@ msgstr "الغاء"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "موافق"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "الخيارات العامّة لتثبيت الحزم"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "دائماً"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "بتاتاً"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "التحقق من الحزم المطلوب تثبيتها:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "برنامج التنزيل المطلوب استخدامه:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "إزالة المصدر"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "هل أنت متأكد أنك تريد إزالة المصدر \"%s\"؟"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "انتظر من فضلك، جاري اضافة الوسيط...."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "تحرير وسيط"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "جاري تحرير الوسيط \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "احفظ التغييرات"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "اعدادات البروكسي..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "تحتاج الى ادخال الوسيط للمتابعة"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "لكي يتم حفظ التغييرات، تحتاج الى ادخال الوسيط في السواقة."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "تهيئة البروكسي"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "إعدادات البروكسي للوسيط \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "إعدادات البروكسي الشّاملة"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -304,166 +265,137 @@ msgstr ""
 "المستضيف[:المنفذ[>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "اسم مستضيف البروكسي"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "يجب عليك تحديد امس مستخدم/كلمة مرور للمصادقة في البروكسي:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "اسم المستخدم:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "أضف مجموعة موازية"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "حرر مجموعة متوازية"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "أضف حدود المصدر"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "اختر وسيط لإضافة حد الوسيط:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "أضف مستضيف"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "أدخل اسم المستضيف أو عنوان IP الخاص بالمستضيف المطلوب اضافته:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "جاري تحرير المجموعة الموازية \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "اسم المجموعة:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "البروتوكول:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "حد الوسيط:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "أضف"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "احذف"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "المستضيفات:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "قم بتهيئة urpmi المتوازي (تنفيذ موزع لـ urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "المجموعة"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "البروتوكول"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "حد الوسائط"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "البروتوكول"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "الأمر"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(لا شئ)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "حرّر"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "أضف..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "قم بإدارة المفاتيح للتواقيع الرقمية الخاصة بالحزم"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "الوسيط"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "تعذر ايجاد اسم، المفتاح لا يوجد في تشفير rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "أضف مفتاح"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "اختر مفتاح لإضافته الى الوسيط %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "احذف مفتاح"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -472,37 +404,32 @@ msgstr ""
 "(اسم المفتاح: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "أضف مفتاح..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "احذف المفتاح"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "تهيئة الوسائط"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "متاح؟"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "حدّث"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -512,38 +439,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "إضافة مُخصص..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "حدّث..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "قم بإدارة المفاتيح..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "موازية..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "الخيارات العامّة..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "مساعدة"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -553,8 +474,7 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -568,8 +488,7 @@ msgstr ""
 "حاسوبك. عندها ستكون هذه المصادر موجودة لتثبيت حزم برمجية جديدة\n"
 "أو لعمل التحديثات."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -580,13 +499,23 @@ msgstr ""
 "المستعملة لقاعدة بيانات الحزم (هل لديك مديروسائط آخر على سطح مكتب آخر، أو هل "
 "أنت تثبّت حزما حاليا كذلك ؟)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "تعذّرت إضافة الوسيط، وسائط خاطئة أو ناقصة"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"أنت بصدد إضافة وسيط رزمات جديد، `%s'.\n"
+"هذا يعني أنّه سيكون باستطاعتك إضافة رزمات برامج جديدة\n"
+"إلى نظامك من هذا الوسيط الجديد."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -596,91 +525,85 @@ msgstr ""
 "هذا يعني أنّه سيكون باستطاعتك إضافة رزمات برامج جديدة\n"
 "إلى نظامك من هذا الوسيط الجديد."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "تمّت إضافة الوسيط `%s' بنجاح."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "تمّت إضافة الوسيط `%s' بنجاح."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "الاستخدام: %s [خيارات]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, fuzzy, c-format
+#: ../rpmdrake:44
+#, fuzzy
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - حدّث فقط وسائط التّحديث.\n"
 
-#: ../rpmdrake:42
-#, fuzzy, c-format
+#: ../rpmdrake:45
+#, fuzzy
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, fuzzy, c-format
+#: ../rpmdrake:49
+#, fuzzy
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                      تقرير خدمة DrakBackup\n"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "جاري التشغيل في وضع المستخدم"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -690,634 +613,517 @@ msgstr ""
 "لن يكون باستطاعتك القيام بتعديلات على النظام،\n"
 "لكن لا يزال بإمكانك استعراض قاعدة البيانات الموجودة."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "تسهيلات المعاقين"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "أرشفة"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "النسخ الاحتياطي"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "نسخ الأقراص"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "الضغط"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "أخرى"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "كتب"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "كتب الكمبيوتر"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "أسئلة متكررة"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "مذكرات (كيف أعمل)"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "أدب"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "عنقود"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "تمرير الرّسائل"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "خدمات الاصطفاف"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "اتصالات"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "قواعد البيانات"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "التطوير"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "التطوير"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME و GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "جافا"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE و Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "النواة"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "بيرل"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "بايثون"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "محررات النصوص"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "تعليم"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "المحاكيات"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "أدوات الملفات"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "ألعاب"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "مغامرات"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "ألعاب"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "ألعاب الأركيد"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "ألعاب لوحات"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "ألعاب ورقية"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "ألغاز"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "رياضة"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "استراتيجية"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "سطح المكتب الرسومي"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "سطح المكتب الرسومي"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "مبنية على FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "كيدي"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "الرسوم"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "مراقبة النظام"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "الوسائط المتعدّدة"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "الشبكات"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "محادثة"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "الشبكات"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "نقل الملفات"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "المراسلة الفورية"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "بريد"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "برامج الأخبار"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "الوصول البعيد"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "الويب"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "برامج المكتب"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "المفاتيح العامّة"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "النشر"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "علوم"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "علم الفلك"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "علوم"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "أحياء"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "كيمياء"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "علوم الحاسب"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "علوم الأرض"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "رياضيات"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "فيزياء"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "برامج سطر الأوامر"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "الصوت"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "النظام"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "الحزم الأساسية"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "التهيئة"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "النظام"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "الإقلاع و بدء التشغيل"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "التهيئة"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "العتاد"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "التحزيم"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "الطباعة"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "الانتشار"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "نشر"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "الخطوط"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "سطر الأوامر"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "الخطوط"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "التدويل"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "النواة و العتاد"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "المكتبات"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "الخادمات"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "محاكيات الطرفيات"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "أدوات النصوص"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "ألعاب طفولية"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "فيديو"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(غير موجود)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "نتائج البحث"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "نتائج البحث (لا شئ)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "انتظر من فضلك، جاري البحث..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "معالج حزم ماندريبا (Rpmdrake)"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "قف"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "قابلة للإضافة"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "قابلة للترقية"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "قابلة للإضافة"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "غير مختارة"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "مختار"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "غير مختارة"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "الأهمية: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "سبب التحديث:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "لا وصف"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "الملفات:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "سجل التغييرات:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "الوسيط: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "الإصدار المثبت حالياً: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "الإسم: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "الإصدار: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "الحجم: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "الأهمية: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "الحجم: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "نبذة: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "سبب التحديث:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "وصف:"
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "لا وصف"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "معالج حزم ماندريبا (Rpmdrake)"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "معلومات أكثر حول الحزمة..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "فضلاً اختر"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "أحد هذه الحزم مطلوب:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "فضلاً اختر"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "انتظر من فضلك، جاري سرد الحزم..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "لا تحديث"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1327,29 +1133,24 @@ msgstr ""
 "لا توجد تحديثات للحزم الموجودة على جهازك،\n"
 "أو أنك قمت بتثبيت كل التحديثات مسبقا."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "الكلّ"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "مزيد من المعلومات"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "معلومات حول الحزم"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "هذه الحزم الاضافية يجب أن تحذف"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1359,13 +1160,11 @@ msgstr ""
 "تحذف:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "بعض الحزم لا يمكن حذفها"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1373,8 +1172,7 @@ msgstr ""
 "ازالة هذه الحزم قد تكسر نظامك، عذراً:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1384,13 +1182,11 @@ msgstr ""
 "الرجوع عن اختيارها الآن:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "هناك حزم اضافية مطلوبة"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1400,18 +1196,17 @@ msgstr ""
 "التالية:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (تنتمي إلى القائمة الواجب تخطّيها)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "لا يمكن تثبيت بعض الحزم"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1421,123 +1216,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "بعض الحزم يجب ازالتها"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "تم اختيار: %d ميغابايت / المساحة المتوفرة في القرص: %d ميغابايت"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "الحجم المختار: %d ميغابايت"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "الوصف غير متوفّر لهذه الحزمة\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "تحديثات أمنية"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "تحديثات ازالة العيوب"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "تثبيت"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "تحديثات عادية"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "تثبيت"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s اختيارات"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "خيارات ماندريبا لينكس"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "كل الحزم، أبجدياً"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "كل الحزم، بالمجموعة"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "كل الحزم، بتوافر التحديث"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "كل الحزم، بالحجم"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "كل الحزم، بحالة الإختيار"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "كل الحزم، بمخزن الوسيط"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "كل الحزم، بتوافر التحديث"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "المتروكات فقط، مرتبة حسب تاريخ التثبيت"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "كل الحزم، بالمجموعة"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "تحديثات عادية"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "تحديثات ازالة العيوب"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "تحديثات عادية"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "تحديثات أمنية"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "في الأسماء"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "في الوصف"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "في أسماء الملفات"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "معلومات عادية"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "أقضى المعلومات"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "عليك اختيار بعض الحزم أولاً."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "تم اختيار حزم كثيرة"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1554,7 +1334,7 @@ msgstr ""
 "هل تريد فعلا تثبيت الحزم؟"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1568,89 +1348,100 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_ملف"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_تحديث الوسط"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_إعادة تعيين الاختيار"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/إعادة تحميل _لائحة الحزم"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_خروج"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>خ"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_خيارات"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/إظ_هار الحزم المُحدّدة آلياً"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/مسا_عدة"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "تحديث ماندريبا لينكس"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "ابحث عن:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "ابحث"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "إمحي"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "تثبيت"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "خروج"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "خطأ قاتل"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "ظهر خطأ قاتل: %s"
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1662,13 +1453,12 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "وسيط تحديث موجود مسبقاً"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1682,13 +1472,12 @@ msgstr ""
 "البرامج لتمكين واحد على الأقل (قم بالتأشير عليها في عامود التمكين؟).\n"
 "ثم قم بإعادة تشغيل أداة %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "كيفية اختيار المرآة يدوياً"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1702,58 +1491,56 @@ msgstr ""
 "\n"
 "ثم أعد تشغيل أداة %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "اتنظر من فضلك، جاري ايجاد الحزم المتوفرة..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "انتظر من فضلك، جاري قراءة قاعدة بيانات الحزم..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "جاري التحقق من %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "التغييرات:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "احذف .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "استخدم .%s كملف رئيسي"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "لا تفعل شيئاً"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "انتهى التثبيت"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "تحقَّق..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "مشكلة أثناء التثبيت"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1763,18 +1550,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "تعذر الحصول على الحزم المصدرية"
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "تعذر الحصول على الحزم المصدرية، عفواً %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1786,38 +1572,34 @@ msgstr ""
 "الأخطاء المقررة:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "تثبيت الحزم..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "جاري البدء..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "تثبيت الحزم..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "غير الوسيط"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "فضلاً أدخل الوسيط المسمى \"%s\" الى الجهاز [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "جاري تنزيل الحزمة `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "جاري التأكد من توقيعات الحزم..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1831,13 +1613,12 @@ msgstr ""
 "\n"
 "هل تريد متابعة التثبيت؟"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "فشل التثبيت"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1849,23 +1630,22 @@ msgstr ""
 "\n"
 "ربما تحتاج الى تحديث فاعدة بيانات الوسائط ."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "جاري تحضير الحزم للتثبيت..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "لم أتمكّن من التّوصّل لإلى ملفّ rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1877,43 +1657,33 @@ msgstr ""
 "تم انشاء بعض ملفات التهيئة مثل `.rpmnew' أو `.rpmsave'،\n"
 "يمكنك الآن التحقق من بعضها لكي تقوم بالمطلوب منها:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "تأتي هذه الحزم مع معلومات التّحديث"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "معلومات أكثر حول الحزمة... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "تعذر ايجاد حزم للتثبيت."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "خطأ غير قابل للتصحيح: تعذر ايجاد حزمة للتثبيت، عفواً."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "انتظر من فضلك، جاري قراءة قاعدة بيانات الحزم..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "انتظر من فضلك، جاري ازالة الحزم..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "ظهرت مشاكل أثناء الحذف"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1923,8 +1693,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1936,8 +1705,8 @@ msgstr ""
 "هذه الأداة ستسمح لك باختيار البرامج التي تريد ازالتها\n"
 "من جهازك."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1949,13 +1718,11 @@ msgstr ""
 "هذه الأداة ستساعدك في اختيار التحديثات التي تريد تثبيتها على\n"
 "جهازك."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "أهلاً إلى أداة تثبيت البرامج!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1969,214 +1736,174 @@ msgstr ""
 "برامجية على أقراص CDROM أو DVD. ستساعدك هذه الأداة في اختيار البرامج\n"
 "اّلتي تريد تثبيتها على حاسوبك."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "تحديث البرامج"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "تحديث ماندريبا لينكس"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "تحديث البرامج"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "الرجاء إدخال عنوان بريدك الألكتروني أدناه "
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "إسم المستخدم:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "حذف حزم البرامج"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "تحديث حزم البرامج"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "تثبيت الحزم البرمجية"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "لا"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "نعم"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "معلومات..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "النمسا"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "أوستراليا"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "بلجيكا"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "البرازيل"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "كندا"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "السويسرية"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "كوستاريكا"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "جمهورية التشيك"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "ألمانيا"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "الدنمارك"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "اليونان"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "أسبانيا"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "فنلندا"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "فرنسا"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "المجر"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "اسرائيل"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "ايطاليا"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "اليابان"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "كوريا"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "هولندا"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "النرويج"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "بولندا"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "البرتغال"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "روسيا"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "السويد"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "سنغافورة"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "سلوفاكيا"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "تايوان"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "المملكة المتحدة"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "الصين"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "الولايات المتحدة"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2188,8 +1915,7 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2201,23 +1927,26 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة ؟"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s اختيارات"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "إنتظر من فضلك، يجري تنزيل عناوين المرايا."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "إنتظر من فضلك، يجري تنزيل عناوين المرايا من موقع ماندريبا."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "خطأ أثناء التنزيل"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2231,8 +1960,8 @@ msgstr ""
 "الشّبكة، أو الموقع، قد يكون غير متوفّر.\n"
 "الرجاء المحاولة لاحقاً."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2246,18 +1975,15 @@ msgstr ""
 "الشّبكة، أو موقع ماندريبا، قد يكونا غير متوفّرين.\n"
 "حاول مجدّدا في وقت لاحق من فضلك."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "لا مرايا"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "لم يمكن العثور على أية مرآة ملائمة."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2271,69 +1997,64 @@ msgstr ""
 "أن تكون هندسة معالجك غير مدعومة\n"
 "من طرف تحديثات ماندريبا لينكس الّرسمية."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "فضلاً اختر المرآة المطلوبة."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "جاري نسخ الملف للوسيط `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "جاري اختبار الملف للوسيط `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "جاري اختبار الملف البعيد للوسيط `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " تم."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " فشل!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s من الوسيط %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "جاري بدء تنزيل `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "تنزيل `%s'، الوقت المتبقي:%s، السرعة:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "تنزيل `%s'، السرعة:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "انتظر من فضلك، جاري تحديث الوسائط..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "خطأ في استرجاع الحزم"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2348,34 +2069,29 @@ msgstr ""
 "لإعداده من جديد، و إمّا الوسيط غير قابل للوصل حاليا و بالتّالي فعليك\n"
 "بالمحاولة مجدّدا فيما بعد."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "حدّث الوسائط"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "اختر الوسائط التي تريد تحديثها:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "تحديد الكل"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "حدّث"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2387,8 +2103,8 @@ msgstr ""
 "الأخطاء:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2398,18 +2114,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "تعذر انشاء الوسيط"
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "فشل عند إضافة الوسيط"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2419,8 +2133,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2429,8 +2143,8 @@ msgstr ""
 "وسيطك `%s'، المُستخدَم للتّحديثات، لا يطابق النسخة %s الّتي تعمل عليها (%s).\n"
 "سيتمّ تعطيله."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2440,13 +2154,11 @@ msgstr ""
 "s).\n"
 "سيتمّ تعطيله."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "تشغيل المساعدة في الخلفية"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "تم بدء نافذة المساعدة، يجب أن تظهر بشكل قصير على سطح المكتب."
@@ -2721,6 +2433,18 @@ msgstr "احذف البرنامج"
 msgid "Software Media Manager"
 msgstr "مدير وسائط البرمجيات"
 
+#~ msgid "Stop"
+#~ msgstr "قف"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "كل الحزم، بمخزن الوسيط"
+
+#~ msgid "Normal information"
+#~ msgstr "معلومات عادية"
+
+#~ msgid "Maximum information"
+#~ msgstr "أقضى المعلومات"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "تم تثبيت كل شئ بشكل صحيح"
 
diff --git a/po/az.po b/po/az.po
index 4e124bec..11c6b79b 100644
--- a/po/az.po
+++ b/po/az.po
@@ -13,7 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-az\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2004-09-12 20:17+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -22,13 +23,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -42,18 +41,17 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:85
+#, fuzzy
 msgid "Official updates"
 msgstr "Normal yeniləmələr"
 
-#: ../edit-urpm-sources.pl:87
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:88
+#, fuzzy, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -68,104 +66,87 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Xahiş edirik gözləyin, mediya yenilənir..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Mediyum əlavə et"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Yerli fayllar"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Cığır:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP vericisi"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "FTP vericisi"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP vericisi"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Çıxardıla bilən avadanlıq"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Cığır ya da bağlama nöqtəsi:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Çıxardıla bilən avadanlıq"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Gəz..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Giriş:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Şifrə:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist'in nisbi cığırı:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Boş buraxılsa, synthesis/hdlist avtomatik olaraq yoxlanacaq"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Ad:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Yeniləmək istədiyiniz mediyanı seçin:"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Ən azından ilk iki girişi doldurmalısınız."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -173,13 +154,11 @@ msgstr ""
 "Bu adla onsuzda bir mediyum mövcuddur, həqiqətən\n"
 "də onu əvəz etmək istəyirsiniz?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Mediyum əlavə edilir:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Mediyum növü:"
 
@@ -187,10 +166,9 @@ msgstr "Mediyum növü:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Ləğv et"
 
@@ -199,101 +177,89 @@ msgstr "Ləğv et"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Oldu"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Paketlər qurulum üçün hazırlanır..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "həmişə"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "heç bir vaxt"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Bə'zi paketlər qurula bilməz"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "`%s' endirilir, sür'ət:%s"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Mənbə Silinməsi"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "\"%s\" mediumunu silmək istəyirsiniz?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Xahiş edirik gözləyin, mediyum silinir..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Mediyumu düzəlt"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" mediyumu dəyişdirilir:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Dəyişiklikləri qeyd et"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Vəkil..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Davam etmək üçün mediyumu daxil etməlisiniz"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Dəyişiklikləri qeyd edə bilmək üçün, mediyumu sürücüyə taxmalısınız."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Vəkilləri quraşdır"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "\"%s\" mediası üçün vəkil qurğuları"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Qlobal vəkil qurğuları"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -302,167 +268,138 @@ msgstr ""
 "girin (yazma qaydası: <vəkilqovşaqadı[:qapı]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Vəkil qovşaq adı:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Vəkil səlahiyyətləndirilməsi üçün istifadəçi adı/şifrə bildirə bilərsiniz:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "İstifadəçi:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Paralel qrup əlavə et"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Paralel qrupu düzəlt"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Mənbə sərhədi əlavə et"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Mediya sərhədinə əlavə etmək üçün mediyum seçin:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Qovşaq əlavə et"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Əlavə ediləcək qovşağın IP ünvanını ya da qovşaq adını girin:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "\"%s\" paralel qrupu dəyişdirilir:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Qrup adı:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Mediya sərhədi:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Əlavə Et"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Sil"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Qovşaqlar:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Paralel urpmi-ni quraşdır"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Qrup"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Mediya sərhədi"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Əmr"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(heç biri)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Düzəlt..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Əlavə Et..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Paketlərin digital imzaları üçün açarları idarə edin"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Mediyum"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "ad tapıla bilmədi, açar rpm keyring içində mövcud deyil!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Açar əlavə et"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "%s mediyumuna əlavə etmək üçün açar seçin"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Açarı sil"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -471,37 +408,32 @@ msgstr ""
 "(açar adı: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Açar əlavə et..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Açarı sil"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Mediyanı quraşdır"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Fəal?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Yenilə"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -511,38 +443,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "Əlavə Et..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Yenilə..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Açarları idarə et..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../edit-urpm-sources.pl:984
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:998
+#, fuzzy
 msgid "Global options..."
 msgstr "Qlobal vəkil qurğuları"
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Yardım"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -552,8 +480,7 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -567,8 +494,7 @@ msgstr ""
 "quraşdırmaqda yardımçı olacaq. Bu mediyaların yardımı ilə daha sonra yeni\n"
 "proqram qurmaq və yeniləmələri etmə imkanına sahib olacaqsınız."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -579,13 +505,23 @@ msgstr ""
 "işlədən digər proqramları bağlayın (hazırda açıq olan başqa bir\n"
 "mediya idarəçisi varsa bağlayın, ya da hazırda paket qurmağı dayandırın)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Medium əlavə edilə bilmədi, səhv ya da əksik arqumentlər"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"`%s' paket mediyumunu əlavə etmək üzrəsiniz.\n"
+"Bunun köməyi ilə sisteminizə bu mediyumdan yeni\n"
+"proqram tə'minatları əlavə edə biləcəksiniz."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -595,91 +531,85 @@ msgstr ""
 "Bunun köməyi ilə sisteminizə bu mediyumdan yeni\n"
 "proqram tə'minatları əlavə edə biləcəksiniz."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "`%s' mediyumu müvəffəqiyyətlə əlavə edildi."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "`%s' mediyumu müvəffəqiyyətlə əlavə edildi."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "İstifadə qaydası: %s [SEÇİM]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, fuzzy, c-format
+#: ../rpmdrake:44
+#, fuzzy
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - ancaq yeniləmə medyanı yenilə.\n"
 
-#: ../rpmdrake:42
-#, fuzzy, c-format
+#: ../rpmdrake:45
+#, fuzzy
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - sadəcə paket adlarını göstər.\n"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, fuzzy, c-format
+#: ../rpmdrake:49
+#, fuzzy
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                      DrakBackup Demon Raportu\n"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "İstifadəçi modunda işləyir"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -689,634 +619,517 @@ msgstr ""
 "Sistem üstündə təkmilləşdirmə apara bilməyəcəksiniz,\n"
 "ancaq yenə də mövcud mə'lumat bazasını gəzə biləcəksiniz."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Yetişmə Qabiliyyəti"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arxivləmə"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Ehtiyatlama"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Cd yazma"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Sıxışdırma"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Digər"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Kitablar"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Kompüter kitabları"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Çox Soruşulan Suallar"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howto sənədləri"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Ədəbiyyat"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Klaster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "İsmarış Keçməsi"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Xidmətlər Növbəyə Alınır"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Rabitə"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Mə'lumat bazaları"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "İnkişaf"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "İnkişaf"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME və GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE və Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Çəyirdək"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editorlar"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Maarif"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulyatorlar"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Fayl vasitələri"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Oyunlar"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Macəra"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Oyunlar"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Əyləncə"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Lövhə oyunları"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kartlar"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Tapmacalar"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "İdman"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategiya"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Qrafiki masa üstü"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Qrafiki masa üstü"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM əsaslı"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Qrafika"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "İzləmə"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedya"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Şəbəkə"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Söhbət"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Şəbəkə"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Fayl transferi"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Canlı ismarışlaşma"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Poçt"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Xəbərlər"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Uzaqdan yetişmə"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Offis"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Açıq Açarlar"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Nəşr"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Elm"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomiya"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Elm"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biyologiya"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kimya"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Kompüter elmi"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geologiya elmləri"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Riyaziyyat"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Qabıqlar"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Səs"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Sistem"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Əsas"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Quraşdırma"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Sistem"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Açılış və Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Quraşdırma"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Avadanlıq"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Paketləmə"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Çap"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "İnkişaf"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "İnkişaf"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Yazı növləri"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsol"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Yazı növləri"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Növ1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitməpi"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Yerliləşdirmə"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Çəyirdək və avadanlıq"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Kitabxanalar"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Vericilər"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminallar"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Mətn vasitələri"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Oyuncaqlar"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Mövcud deyil)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Axtarış nəticələri"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Axtarış nəticələri (heçnə)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Xahiş edirik gözləyin, axtarılır..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Dayan"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Əlvə edilə bilən"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Yenilənə bilən"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Əlvə edilə bilən"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Seçili deyil"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Seçili"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Seçili deyil"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Vaciblik: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Yeniləmə səbəbi: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "İzahat yoxdur"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fayllar:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Dəyişmə qeydi:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Mediyum: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Hazırda qurulu olan buraxılış: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Ad: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Buraxılış: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Böyüklük: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Vaciblik: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Böyüklük: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "İcmal: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Yeniləmə səbəbi: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "İzahat: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "İzahat yoxdur"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Paket haqqında daha çox mə'lumat..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Xahiş edirik seçin"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Aşağıdakı paketlərin birinə ehtiyac var:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Xahiş edirik seçin"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Xahiş edirik gözləyin, paketlər sıralanır..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Yeniləmə yoxdur"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1326,29 +1139,24 @@ msgstr ""
 "qurulu olan heç bir paketin yeniləməsi yoxdur, ya da siz onları\n"
 "onsuz da qurmusunuz və bütün proqram tə'minatlarınız yenidir."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Hamısı"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Daha çox mə'lumat"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Paketlər haqqında mə'lumat"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Bə'zi əlavə paketlər kənar edilməlidir"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1357,13 +1165,11 @@ msgstr ""
 "Asılılıqlarına görə, bu paket(lər) də silinməlidir\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Bə'zi paketlər silinə bilməz"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1371,8 +1177,7 @@ msgstr ""
 "Bu paketləri çıxartmaq sisteminizi xarab edəcək, üzr istəyirik:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1382,13 +1187,11 @@ msgstr ""
 "seçilməməlidir:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Əlavə paketlərə ehtiyac var"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1398,18 +1201,17 @@ msgstr ""
 "qurulmalıdır:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Bə'zi paketlər qurula bilməz"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1419,123 +1221,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Bəzi paketlər kənar edilməlidir"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seçili: %d MB / Boş disk sahəsi: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Seçili böyüklük: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "BU paketin izahatı mövcud deyil\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Təhlükəsizlik yeniləmələri"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Xəta düzəltməsi yeniləmələri"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Qur"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normal yeniləmələr"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Qur"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux seçimləri"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Bütün paketlər, əlifba sırasına görə"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Bütün paketlər, qrupa görə"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Bütün paketlər, yeniləmə imkanlarına görə"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Bütün paketlər, böyüklüklərinə görə"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Bütün paketlər, seçim vəziyyətinə görə"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Bütün paketlər, mediyumun saxlandığı yerə görə"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Bütün paketlər, yeniləmə imkanlarına görə"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Qurulma tarixinə görə sıralanmış, yalnız yarpaqlar"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Bütün paketlər, qrupa görə"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normal yeniləmələr"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Xəta düzəltməsi yeniləmələri"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normal yeniləmələr"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Təhlükəsizlik yeniləmələri"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "adlarda"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "izahatlarda"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "fayl adlarında"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normal mə'lumat"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maksimal mə'lumat"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Əvvəlcə bə'zi paketləri seçməlisiniz."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Həddindən artıq çox paket seçilib"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1551,7 +1338,7 @@ msgstr ""
 "Həqiqətən də bütün seçili paketləri qurmaq istəyirsiniz?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1565,89 +1352,104 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Fayl"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Mediyanı yenilə"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Seçimi sıfırla"
 
-#: ../rpmdrake:1177
-#, fuzzy, c-format
+#: ../rpmdrake:1173
+#, fuzzy
 msgid "/Reload the _packages list"
 msgstr "Paket siyahısını yenidən yüklə"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/Çı_x"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Seçimlər"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, fuzzy, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
+#, fuzzy
 msgid "/_Show automatically selected packages"
 msgstr "Avtomatik seçili paketləri göstər"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Update"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Axtar:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Axtar"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Təmizlə"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Qur"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Çıx"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Ölümcül xəta"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Ölümcül xəta yarandı: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1659,13 +1461,12 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Onsuzda mövcud olan yeniləmə mediyası"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1681,13 +1482,12 @@ msgstr ""
 "\n"
 "Daha sonra, %s'i yenidən başladın."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Əksinizin əl ilə necə seçiləcəyi"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1701,58 +1501,56 @@ msgstr ""
 "\n"
 "Daha sonra, %s'i yenidən başladın."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Xahiş edirik gözləyin, mövcud paketlər tapılır..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Xahiş edirik gözləyin, paket mə'lumat bazası oxunur..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "%s yoxlanır"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "dəyişikliklər:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "%s'i sil"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "%s faylını əsas fayl olaraq işlət"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Heç bir şey etmə"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Qurulum bitdi"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Təftiş Et..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "İstənən bütün paketlər müvəffəqiyyətlə quruldu."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Qurma əsnasında problem"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1762,18 +1560,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Mənbə paketləri alına bilmədi."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Mənbə paketləri alına bilmədi, üzr istəyirik. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1785,38 +1582,34 @@ msgstr ""
 "Raport edilən xəta(lar):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Paket qurulumu..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Hazırlanır..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Paket qurulumu..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Mediyumu dəyişdir"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Xahiş edirik, \"%s\" adlı mediyanı [%s] avadanlığına daxil edin"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' paketi endirilir (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Paketlərin imzaları yoxlanır..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1830,13 +1623,12 @@ msgstr ""
 "\n"
 "Yenə də qurulumu davam etdirmək istəyirsiniz?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Qurulum bacarılmadı"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1848,23 +1640,22 @@ msgstr ""
 "\n"
 "Mediya mə'lumat bazasını yeniləməyi məsləhət görürük."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Paketlər qurulum üçün hazırlanır..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Qurulan paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm faylı [%s] çatıla bilmir"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1876,44 +1667,34 @@ msgstr ""
 "`.rpmnew' ya da `.rpmsave' adı altında qurğu faylları yaradıldı,\n"
 "indi siz bə'zilərini yoxlaya bilərsiniz:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Bu paketlər yeniləmə məlumatı ilə bərabər gəlir"
 
-#: ../rpmdrake:1722
-#, fuzzy, c-format
+#: ../rpmdrake:1819
+#, fuzzy, perl-format
 msgid "More information on package... [%s]"
 msgstr "Paket haqqında daha çox mə'lumat..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Qurulum üçün paket tapılmadı."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Düzəldilə bilməyən xəta: qurulum üçün heç bir paket tapılmadı, üzr istəyirik."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Xahiş edirik gözləyin, paket mə'lumat bazası oxunur..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Xahiş edirik gözləyin, paketlər silinir..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Silmə əsnasında problemlər"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1923,8 +1704,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1936,8 +1716,8 @@ msgstr ""
 "Bu vasitə sizə kompüterinizdən silmək istədiyiniz proqramları seçməkdə\n"
 "yardım edəcək."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1949,13 +1729,11 @@ msgstr ""
 "Bu vasitə sizə kompüterinizə qurmaq istədiyiniz yeniləmələri seçməkdə\n"
 "yardım edəcək."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1969,214 +1747,176 @@ msgstr ""
 "Bu vasitə sizə kompüterinizə qurmaq istədiyiniz tə'minatları seçməkdə\n"
 "yardım edəcək."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Proqram Tə'minatlarının Yenilənməsi"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Update"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Proqram Tə'minatlarının Yenilənməsi"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Xahiş edirik, aşağıya epoçt ünvanınızı daxil edin"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "İstifadəçi adı:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Proqram Tə'minatlarının Silinməsi"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Proqram Tə'minatlarının Yenilənməsi"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Proqram Tə'minatlarının Qurulması"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Xeyir"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Bəli"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Mə'lumat..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Avstriya"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Avstraliya"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belçika"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Braziliya"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "İsveçrə"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Çex Respublikası"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Almanya"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Yunanıstan"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "İspaniya"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Fransa"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Macarıstan"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "İsrail"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "İtaliya"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Yaponiya"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Koreya"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Hollandiya"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norveç"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polşa"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portuqaliya"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusiya"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "İsveç"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Sinqapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakiya"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Birləşmiş Krallıq"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Çin"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Birləşmiş Ştatlar"
 
-#: ../rpmdrake.pm:505
-#, fuzzy, c-format
+#: ../rpmdrake.pm:518
+#, fuzzy
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2188,8 +1928,7 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2201,25 +1940,28 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Xahiş edirik gözləyin, Mandriva veb saytından əkslərin ünvanları endirilir."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Xahiş edirik gözləyin, Mandriva veb saytından əkslərin ünvanları endirilir."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Endirmə əsnasında xəta"
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2233,8 +1975,8 @@ msgstr ""
 "Bəlkə də şəbəkə ya da Mandriva veb saytı hazırda fəal deyil.\n"
 "Xahiş edirik, daha sonra yenidən sınayın."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2248,18 +1990,15 @@ msgstr ""
 "Bəlkə də şəbəkə ya da Mandriva veb saytı hazırda fəal deyil.\n"
 "Xahiş edirik, daha sonra yenidən sınayın."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Əkssiz"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2273,69 +2012,64 @@ msgstr ""
 "isə CPU'nun quruluşunun Mandriva Linux Rəsmi Yeniləmələri\n"
 "tərəfindən dəstəklənməməsidir."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Xahiş edirik uyğun əksi seçin."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' mediyumu üçün köçürülür..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Mediyumun `%s' faylı yoxlanılır..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Mediyumun uzaqdakı`%s' faylı yoxlanır..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " bitdi."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr "bacarılmadı!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%2$s mənbəsindən %1$s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' endirilməyə başlanır..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' endirilir, qalan vaxt:%s, sür'ət:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' endirilir, sür'ət:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Xahiş edirik gözləyin, mediya yenilənir..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Paketlər alına bilmədi"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2347,34 +2081,30 @@ msgstr ""
 "`%s' mediadan yeni paketlərin siyahısı alına bilmir.\n"
 "Xahiş edirik, Media İdrəçisindən səhv medianı silib yenidən  əlavə edin."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Mediyanı yenilə"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Yeniləmək istədiyiniz mediyanı seçin:"
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr "Seçili"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Yenilə"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2386,8 +2116,8 @@ msgstr ""
 "Xətalar:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2397,18 +2127,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Mediyum yaradıla bilmir."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Medium əlavə etmə xətası"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2418,8 +2146,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, fuzzy, c-format
+#: ../rpmdrake.pm:849
+#, fuzzy, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2429,8 +2157,8 @@ msgstr ""
 "(%s) uyğun gəlmi.\n"
 "O indi qeyri-fəallaşdırılacaqdır."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2440,13 +2168,11 @@ msgstr ""
 "(%s) uyğun gəlmi.\n"
 "O indi qeyri-fəallaşdırılacaqdır."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Yardım arxa planda başladı"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "Yardım pəncərəsi başladılıb, yaxın vaxtda masa üstünüzdə göstəriləcək."
@@ -2721,6 +2447,18 @@ msgstr "Proqram Sil"
 msgid "Software Media Manager"
 msgstr "Tə'minat Mənbələri İdarəçisi"
 
+#~ msgid "Stop"
+#~ msgstr "Dayan"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Bütün paketlər, mediyumun saxlandığı yerə görə"
+
+#~ msgid "Normal information"
+#~ msgstr "Normal mə'lumat"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maksimal mə'lumat"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "Hərşey düzgün quruldu"
 
diff --git a/po/be.po b/po/be.po
index 60211dbf..23393681 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2000-08-19 08:45+0200\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be <be@li.org>\n"
@@ -14,13 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -34,18 +32,17 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:85
+#, fuzzy
 msgid "Official updates"
 msgstr "Рэжым Mmap"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -56,116 +53,104 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: ../edit-urpm-sources.pl:128
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:130
+#, fuzzy
 msgid "Add a medium"
 msgstr "Дадаць карыстальніка"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Мясцовыя файлы"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Шлях:"
 
-#: ../edit-urpm-sources.pl:131
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:133
+#, fuzzy
 msgid "FTP server"
 msgstr "X сервер"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "X сервер"
 
-#: ../edit-urpm-sources.pl:133
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:135
+#, fuzzy
 msgid "HTTP server"
 msgstr "X сервер"
 
-#: ../edit-urpm-sources.pl:134
-#, fuzzy, c-format
-msgid "Removable device"
-msgstr "Аддалены прынтэр"
-
-#: ../edit-urpm-sources.pl:134
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:136
+#, fuzzy
 msgid "Path or mount point:"
 msgstr "Пункт манціравання:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+#, fuzzy
+msgid "Removable device"
+msgstr "Аддалены прынтэр"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Праглядзець..."
 
-#: ../edit-urpm-sources.pl:180
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:183
+#, fuzzy
 msgid "Login:"
 msgstr "Імя (login ID)"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Пароля:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Імя:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Пазначце карыстальнікаў каб аб'яднаць у гэтыю групу"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:239
+#, fuzzy
 msgid "Adding a medium:"
 msgstr "Дадаць карыстальніка"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr ""
 
@@ -173,10 +158,9 @@ msgstr ""
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Адмена"
 
@@ -185,350 +169,314 @@ msgstr "Адмена"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Ок"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Падрыхтоўка ўсталяваньня"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "заўсёды"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "ніколі"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Выбар пакетаў"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Мэнэджэр сэрвісаў"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:357
-#, fuzzy, c-format
+#, fuzzy
 msgid "Please wait, removing medium..."
 msgstr "Падрыхтоўка ўсталяваньня"
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:414
-#, fuzzy, c-format
+#, fuzzy
 msgid "Save changes"
 msgstr "Змена спева"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Проксі..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:455
-#, fuzzy, c-format
+#, fuzzy
 msgid "Configure proxies"
 msgstr "Настройка IDE"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:471
-#, fuzzy, c-format
+#, fuzzy
 msgid "Proxy hostname:"
 msgstr "Імя машыны"
 
 #: ../edit-urpm-sources.pl:474
-#, fuzzy, c-format
+#, fuzzy
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Першы сектар загрузачнага раздзелу"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Карыстальнік(ца):"
 
 #: ../edit-urpm-sources.pl:545
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a parallel group"
 msgstr "Дадаць карыстальніка"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:556
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a medium limit"
 msgstr "Дадаць карыстальніка"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:605
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a host"
 msgstr "Дадаць карыстальніка"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Імя групы:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Пратакол:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Дадаць"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Выдаліць"
 
 #: ../edit-urpm-sources.pl:656
-#, fuzzy, c-format
+#, fuzzy
 msgid "Hosts:"
 msgstr "Хост:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Група"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Пратакол"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Пратакол"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Каманда"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(не)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Рэдагаваць"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Дадаць..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Сярэдне"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:789
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a key"
 msgstr "Дадаць карыстальніка"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:829
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remove a key"
 msgstr "/Выдаліць дохлыя файлы"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:848
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a key..."
 msgstr "Дадаць карыстальніка"
 
 #: ../edit-urpm-sources.pl:852
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remove key"
 msgstr "Аддалены прынтэр"
 
 #: ../edit-urpm-sources.pl:868
-#, fuzzy, c-format
+#, fuzzy
 msgid "Configure media"
 msgstr "Настроіць панэль"
 
-#: ../edit-urpm-sources.pl:893
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:907
+#, fuzzy
 msgid "Enabled?"
 msgstr "Дазволіць пашырэнне"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Аднавіць"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr "Немагчыма адчыніць файл %s\n"
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "Дадаць"
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:981
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:995
+#, fuzzy
 msgid "Manage keys..."
 msgstr "Наладка вашага сэансу"
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Дапамога"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -537,8 +485,7 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -546,939 +493,854 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
 "to your system from that new medium."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, perl-format
+msgid "Successfully added media %s."
+msgstr ""
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Выкарыстаньне: %s [ВЫБАР]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, fuzzy, c-format
+#: ../rpmdrake:49
+#, fuzzy
 msgid "  --root                 force to run as root"
 msgstr "  --no-mmx                 Не выкарыстоўваць шаблёны MMX.\n"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Зручнасьці"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr ""
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Рэзерваваньне даньняў"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr ""
 
-#: ../rpmdrake:191
-#, fuzzy, c-format
+#: ../rpmdrake:201
+#, fuzzy
 msgid "Compression"
 msgstr "Сэанс"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Іншыя"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, fuzzy, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
+#, fuzzy
 msgid "Books"
 msgstr "Закладкі (cookies)"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:194
-#, fuzzy, c-format
+#: ../rpmdrake:204
+#, fuzzy
 msgid "Faqs"
 msgstr "Гульні"
 
-#: ../rpmdrake:195
-#, fuzzy, c-format
+#: ../rpmdrake:205
+#, fuzzy
 msgid "Howtos"
 msgstr "Хост:"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:200
-#, fuzzy, c-format
+#: ../rpmdrake:210
+#, fuzzy
 msgid "Communications"
 msgstr "Канфігурацыя"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, fuzzy, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
+#, fuzzy
 msgid "Databases"
 msgstr "База даньняў дыскаў"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Распрацоўка"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Распрацоўка"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Ядро"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Рэдактары"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Адукацыя"
 
-#: ../rpmdrake:214
-#, fuzzy, c-format
+#: ../rpmdrake:225
+#, fuzzy
 msgid "Emulators"
 msgstr "Калькулятар"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Гульні"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr ""
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Гульні"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Аркады"
 
-#: ../rpmdrake:218
-#, fuzzy, c-format
+#: ../rpmdrake:229
+#, fuzzy
 msgid "Boards"
 msgstr "Карты"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Карты"
 
-#: ../rpmdrake:221
-#, fuzzy, c-format
+#: ../rpmdrake:232
+#, fuzzy
 msgid "Puzzles"
 msgstr "Пурпурны"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Спорт"
 
-#: ../rpmdrake:223
-#, fuzzy, c-format
+#: ../rpmdrake:234
+#, fuzzy
 msgid "Strategy"
 msgstr "Тактыка і стратэгія"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, fuzzy, c-format
-msgid "Graphical desktop"
-msgstr "Іншыя графічныя Працоўныя сталы"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr ""
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#, fuzzy
+msgid "Graphical desktop"
+msgstr "Іншыя графічныя Працоўныя сталы"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, fuzzy, c-format
+#: ../rpmdrake:242
+#, fuzzy
 msgid "WindowMaker"
 msgstr "Паводзіны вокнаў"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Графіка"
 
-#: ../rpmdrake:233
-#, fuzzy, c-format
+#: ../rpmdrake:244
+#, fuzzy
 msgid "Monitoring"
 msgstr "Манітор"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Музыка й фільмы"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, fuzzy, c-format
-msgid "Networking"
-msgstr "Сетка"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Гутарка"
 
-#: ../rpmdrake:236
-#, fuzzy, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+#, fuzzy
+msgid "Networking"
+msgstr "Сетка"
+
+#: ../rpmdrake:247
+#, fuzzy
 msgid "File transfer"
 msgstr "Мэнэджэр файлаў"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr ""
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Навіны"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr ""
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "Уэб"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Офіс"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Выдавецтва"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, fuzzy, c-format
-msgid "Sciences"
-msgstr "Радкі"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Зоркаведаньне"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+#, fuzzy
+msgid "Sciences"
+msgstr "Радкі"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr ""
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr ""
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr ""
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr ""
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr ""
 
-#: ../rpmdrake:255
-#, fuzzy, c-format
+#: ../rpmdrake:266
+#, fuzzy
 msgid "Shells"
 msgstr "Абалонка:"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Гук"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Сістэма"
-
-#: ../rpmdrake:257
-#, fuzzy, c-format
+#: ../rpmdrake:268
+#, fuzzy
 msgid "Base"
 msgstr "Басы"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Канфігурацыя"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Сістэма"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr ""
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Канфігурацыя"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Абсталяваньне"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr ""
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Друкаваньне"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Распрацоўка"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Распрацоўка"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Шрыфты"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr ""
 
-#: ../rpmdrake:267
-#, fuzzy, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Шрыфты"
+
+#: ../rpmdrake:278
+#, fuzzy
 msgid "True type"
 msgstr "Тып мышы: %s\n"
 
-#: ../rpmdrake:268
-#, fuzzy, c-format
+#: ../rpmdrake:279
+#, fuzzy
 msgid "Type1"
 msgstr "Тып"
 
-#: ../rpmdrake:269
-#, fuzzy, c-format
+#: ../rpmdrake:280
+#, fuzzy
 msgid "X11 bitmap"
 msgstr "Растар"
 
-#: ../rpmdrake:270
-#, fuzzy, c-format
+#: ../rpmdrake:281
+#, fuzzy
 msgid "Internationalization"
 msgstr "Слоўнік GNOME"
 
-#: ../rpmdrake:271
-#, fuzzy, c-format
+#: ../rpmdrake:282
+#, fuzzy
 msgid "Kernel and hardware"
 msgstr "Гл. апісанне абсталявання"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Бібліятэкі"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Сэрвэры"
 
-#: ../rpmdrake:274
-#, fuzzy, c-format
+#: ../rpmdrake:285
+#, fuzzy
 msgid "XFree86"
 msgstr "Сервер XFree86 %s"
 
-#: ../rpmdrake:275
-#, fuzzy, c-format
+#: ../rpmdrake:286
+#, fuzzy
 msgid "Terminals"
 msgstr "Тэрмінал GNOME"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr ""
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Цацкі"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Відэа"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, fuzzy, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
+#, fuzzy
 msgid "(Not available)"
 msgstr "няма даступных раздзелаў"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Вынікі пошуку"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, fuzzy, c-format
+#: ../rpmdrake:457
+#, fuzzy
 msgid "Please wait, searching..."
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr ""
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Спыніць"
+#: ../rpmdrake:529 ../rpmdrake:746
+#, fuzzy
+msgid "Addable"
+msgstr "(адмовіць)"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, fuzzy, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
+#, fuzzy
 msgid "Upgradable"
 msgstr "Аркады"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, fuzzy, c-format
-msgid "Addable"
-msgstr "(адмовіць)"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Ня вылучаны"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Пазначаны"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Ня вылучаны"
+#: ../rpmdrake:574 ../rpmdrake:607
+#, fuzzy
+msgid "Importance: "
+msgstr "важна"
+
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr ""
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Апісаньне адсутнічае"
 
-#: ../rpmdrake:553
-#, fuzzy, c-format
+#: ../rpmdrake:586
+#, fuzzy
 msgid "Files:\n"
 msgstr "Файлы"
 
-#: ../rpmdrake:558
-#, fuzzy, c-format
+#: ../rpmdrake:591
+#, fuzzy
 msgid "Changelog:\n"
 msgstr "Каналы:"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:565
-#, fuzzy, c-format
+#: ../rpmdrake:597
+#, fuzzy
 msgid "Currently installed version: "
 msgstr "Настройка драйверу Sun"
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Імя: "
 
-#: ../rpmdrake:574
-#, fuzzy, c-format
+#: ../rpmdrake:602
+#, fuzzy
 msgid "Version: "
 msgstr "Версія: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, fuzzy, c-format
-msgid "Size: "
-msgstr "Памер: %s"
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr ""
 
-#: ../rpmdrake:579
-#, fuzzy, c-format
-msgid "Importance: "
-msgstr "важна"
+#: ../rpmdrake:604
+#, fuzzy
+msgid "Size: "
+msgstr "Памер: %s"
 
-#: ../rpmdrake:582
-#, fuzzy, c-format
+#. extra empty line
+#: ../rpmdrake:611
+#, fuzzy
 msgid "Summary: "
 msgstr "Агульныя зьвесткі"
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr ""
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Апісаньне:"
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Апісаньне адсутнічае"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr ""
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, fuzzy, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
+#, fuzzy
 msgid "More information on package..."
 msgstr "Інфармацыя аб памяці"
 
-#: ../rpmdrake:618
-#, fuzzy, c-format
-msgid "Please choose"
-msgstr "калі ласка, пазначце тып вашай мышы."
-
-#: ../rpmdrake:618
-#, fuzzy, c-format
+#: ../rpmdrake:672
+#, fuzzy
 msgid "One of the following packages is needed:"
 msgstr "Наступныя пакеты будуць даданы да сістэмы"
 
-#: ../rpmdrake:639
-#, fuzzy, c-format
+#: ../rpmdrake:672
+#, fuzzy
+msgid "Please choose"
+msgstr "калі ласка, пазначце тып вашай мышы."
+
+#: ../rpmdrake:695
+#, fuzzy
 msgid "Please wait, listing packages..."
 msgstr "Усталяванне пакету %s"
 
-#: ../rpmdrake:657
-#, fuzzy, c-format
+#: ../rpmdrake:713
+#, fuzzy
 msgid "No update"
 msgstr "Імя друкаркі"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means 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:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Усё"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, fuzzy, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
+#, fuzzy
 msgid "More info"
 msgstr "Дастасаваньні"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, fuzzy, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
+#, fuzzy
 msgid "Information on packages"
 msgstr "Інфармацыя"
 
-#: ../rpmdrake:757
-#, fuzzy, c-format
+#: ../rpmdrake:813
+#, fuzzy
 msgid "Some additional packages need to be removed"
 msgstr "Наступныя пакеты будуць выдалены"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, fuzzy, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
+#, fuzzy
 msgid "Some packages can't be removed"
 msgstr "Наступныя пакеты будуць выдалены"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:804
-#, fuzzy, c-format
+#: ../rpmdrake:860
+#, fuzzy
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr "Наступныя пакеты будуць даданы да сістэмы"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:822
-#, fuzzy, c-format
+#: ../rpmdrake:878
+#, fuzzy
 msgid "Some packages can't be installed"
 msgstr "Выбар пакетаў"
 
-#: ../rpmdrake:823
-#, fuzzy, c-format
+#: ../rpmdrake:879
+#, fuzzy, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s"
 msgstr "Наступныя пакеты будуць даданы да сістэмы"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, fuzzy, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
+#, fuzzy
 msgid "Some packages need to be removed"
 msgstr "Наступныя пакеты будуць выдалены"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:864
-#, fuzzy, c-format
+#: ../rpmdrake:920
+#, fuzzy, perl-format
 msgid "Selected size: %d MB"
 msgstr "Памер файла: %d байт"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:939
-#, fuzzy, c-format
-msgid "Security updates"
-msgstr "Бясьпека"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr ""
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Усталёўка"
 
-#: ../rpmdrake:939
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Рэжым Mmap"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Усталёўка"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, fuzzy, c-format
+#: ../rpmdrake:1004
+#, fuzzy
 msgid "Mandriva Linux choices"
 msgstr "Наладка вашага сэансу"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:973
-#, fuzzy, c-format
+#: ../rpmdrake:1009
+#, fuzzy
 msgid "All packages, by selection state"
 msgstr "Асабісты выбар пакетаў"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
+#: ../rpmdrake:1010
+msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
+#: ../rpmdrake:1011
+msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:982
-#, c-format
-msgid "Leaves only, sorted by install date"
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Рэжым Mmap"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy, c-format
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "Normal updates"
+msgstr "Рэжым Mmap"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "Security updates"
+msgstr "Бясьпека"
+
+#: ../rpmdrake:1068
+#, fuzzy
 msgid "in names"
 msgstr "Гульня ў косьці"
 
-#: ../rpmdrake:1059
-#, fuzzy, c-format
+#: ../rpmdrake:1070
+#, fuzzy
 msgid "in descriptions"
 msgstr "Апісанне"
 
-#: ../rpmdrake:1061
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "Уласнае імя"
 
-#: ../rpmdrake:1070
-#, fuzzy, c-format
-msgid "Normal information"
-msgstr "Інфармацыя аб памяці"
-
-#: ../rpmdrake:1070
-#, fuzzy, c-format
-msgid "Maximum information"
-msgstr "Інфармацыя аб DMA"
-
 #: ../rpmdrake:1098
-#, fuzzy, c-format
+#, fuzzy
 msgid "You need to select some packages first."
 msgstr "Вы не можаце вылучаць і адмяняць вылучэнне гэтага пакету"
 
 #: ../rpmdrake:1103
-#, fuzzy, c-format
+#, fuzzy
 msgid "Too many packages are selected"
 msgstr "Гэта абавязковы пакет, яго вылучэнне нельга адмяніць"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1489,7 +1351,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1498,91 +1360,105 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Іншыя"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Дзеяньні"
 
-#: ../rpmdrake:1177
-#, fuzzy, c-format
+#: ../rpmdrake:1173
+#, fuzzy
 msgid "/Reload the _packages list"
 msgstr "Выбар пакетаў"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Выхад"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Налады"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Дапамога"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Наладка вашага сэансу"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Шукаць:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Шукаць"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Ачысьціць"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Усталёўка"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Выхад"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr ""
 
-#: ../rpmdrake:1277
-#, fuzzy, c-format
+#: ../rpmdrake:1307
+#, fuzzy, perl-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 "ПАМЫЛАЧКА АТРЫМАЛАСЯ: \n"
 "%s"
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1590,13 +1466,12 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr ""
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1606,13 +1481,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1621,76 +1495,81 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1343
-#, fuzzy, c-format
+#: ../rpmdrake:1372
+#, fuzzy
 msgid "Please wait, finding available packages..."
 msgstr "Прагляд даступных пакетаў"
 
-#: ../rpmdrake:1434
-#, fuzzy, c-format
+#: ../rpmdrake:1373
+#, fuzzy
+msgid "Please wait, reading packages database..."
+msgstr "Падрыхтоўка ўсталяваньня"
+
+#: ../rpmdrake:1528
+#, fuzzy, perl-format
 msgid "Inspecting %s"
 msgstr "Усталёўваем"
 
-#: ../rpmdrake:1457
-#, fuzzy, c-format
+#: ../rpmdrake:1551
+#, fuzzy
 msgid "changes:"
 msgstr "Мэнэджэр сэрвісаў"
 
-#: ../rpmdrake:1465
-#, fuzzy, c-format
+#: ../rpmdrake:1559
+#, fuzzy, perl-format
 msgid "Remove .%s"
 msgstr "/Перавярнуць спіс"
 
-#: ../rpmdrake:1469
-#, fuzzy, c-format
+#: ../rpmdrake:1563
+#, fuzzy, perl-format
 msgid "Use .%s as main file"
 msgstr "Дрэнны файл рэзервовай копіі"
 
-#: ../rpmdrake:1473
-#, fuzzy, c-format
+#: ../rpmdrake:1567
+#, fuzzy
 msgid "Do nothing"
 msgstr "Нічога"
 
-#: ../rpmdrake:1489
-#, fuzzy, c-format
+#: ../rpmdrake:1583
+#, fuzzy
 msgid "Installation finished"
 msgstr "Усталяванне SILO"
 
-#: ../rpmdrake:1504
-#, fuzzy, c-format
+#: ../rpmdrake:1598
+#, fuzzy
 msgid "Inspect..."
 msgstr "Настройка IDE"
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, fuzzy, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
+#, fuzzy
 msgid "Problem during installation"
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, fuzzy, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, fuzzy, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: ../rpmdrake:1556
-#, fuzzy, c-format
+#: ../rpmdrake:1653
+#, fuzzy
 msgid "Unable to get source packages."
 msgstr "Немагчыма захаваць спіс"
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1698,38 +1577,37 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1567
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Падрыхтоўка ўсталяваньня"
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Ініцыялізацыя..."
 
-#: ../rpmdrake:1576
-#, fuzzy, c-format
+#: ../rpmdrake:1664
+#, fuzzy
+msgid "Package installation..."
+msgstr "Падрыхтоўка ўсталяваньня"
+
+#: ../rpmdrake:1673
+#, fuzzy
 msgid "Change medium"
 msgstr "Змяніць тып раздзелу"
 
-#: ../rpmdrake:1577
-#, fuzzy, c-format
+#: ../rpmdrake:1674
+#, fuzzy, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Устаўце дыскету ў дыскавод %s"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1607
-#, fuzzy, c-format
+#: ../rpmdrake:1704
+#, fuzzy
 msgid "Verifying package signatures..."
 msgstr "Пошук пакетаў для абнаўлення"
 
-#: ../rpmdrake:1620
-#, fuzzy, c-format
+#: ../rpmdrake:1717
+#, fuzzy, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1738,13 +1616,13 @@ msgid ""
 "Do you want to continue installation?"
 msgstr "Наступныя пакеты будуць даданы да сістэмы"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, fuzzy, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
+#, fuzzy
 msgid "Installation failed"
 msgstr "Усталяванне SILO"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1752,23 +1630,22 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1645
-#, fuzzy, c-format
+#: ../rpmdrake:1742
+#, fuzzy
 msgid "Preparing packages installation..."
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: ../rpmdrake:1648
-#, fuzzy, c-format
+#: ../rpmdrake:1745
+#, fuzzy, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Усталяванне пакету %s"
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1776,51 +1653,42 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1722
-#, fuzzy, c-format
+#: ../rpmdrake:1819
+#, fuzzy, perl-format
 msgid "More information on package... [%s]"
 msgstr "Інфармацыя аб памяці"
 
-#: ../rpmdrake:1735
-#, fuzzy, c-format
+#: ../rpmdrake:1832
+#, fuzzy
 msgid "No package found for installation."
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1757
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Падрыхтоўка ўсталяваньня"
-
-#: ../rpmdrake:1809
-#, fuzzy, c-format
+#: ../rpmdrake:1858
+#, fuzzy
 msgid "Please wait, removing packages..."
 msgstr "Прагляд даступных пакетаў"
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake:1821
-#, fuzzy, c-format
+#: ../rpmdrake:1870
+#, fuzzy, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr "Атрымалася памылка ўпарадкавання пакетаў:"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1828,8 +1696,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1837,13 +1705,11 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1852,214 +1718,179 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Мэнэджэр сэрвісаў"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr ""
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Мэнэджэр сэрвісаў"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Калі ласка, увядзіце Ваш пароль для гэтае пляцоўкі"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Імя карыстальніка:"
 
-#: ../rpmdrake.pm:170
-#, fuzzy, c-format
+#: ../rpmdrake.pm:172
+#, fuzzy
 msgid "Software Packages Removal"
 msgstr "Мэнэджэр сэрвісаў"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Мэнэджэр сэрвісаў"
 
-#: ../rpmdrake.pm:172
-#, fuzzy, c-format
+#: ../rpmdrake.pm:174
+#, fuzzy
 msgid "Software Packages Installation"
 msgstr "Асабісты выбар пакетаў"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Так"
 
-#: ../rpmdrake.pm:263
-#, fuzzy, c-format
+#: ../rpmdrake.pm:265
+#, fuzzy
 msgid "Info..."
 msgstr "Інфармацыя"
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Аўстрыя"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Аўстралія"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Бэльгія"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Бразылія"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Щвэйцарыя"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Коста-Рыка"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Чэская Рэспубліка"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Нямецкі"
 
-#: ../rpmdrake.pm:385
-#, fuzzy, c-format
+#: ../rpmdrake.pm:390
+#, fuzzy
 msgid "Danmark"
 msgstr "Данія"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Грэцыя"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Гішпанія"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Фінляндыя"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Францыя"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Вугоршчына"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Ізраіль"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Італія"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Японія"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Карэя"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Нідэрлянды"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Нарвэгія"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Польшча"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Партугалія"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Расея"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Швэцыя"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Сынгапур"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Славакія"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Злучанае Каралеўства"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Кітай"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Злучаныя Штаты"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2067,8 +1898,7 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2076,23 +1906,27 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 
-#: ../rpmdrake.pm:522
-#, fuzzy, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
+#, fuzzy
 msgid "Error during download"
 msgstr "Памылка аднаўленьня меню"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2101,8 +1935,8 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2111,18 +1945,16 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:538
-#, fuzzy, c-format
+#: ../rpmdrake.pm:554
+#, fuzzy
 msgid "No mirror"
 msgstr "Няма мікшера"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2131,69 +1963,69 @@ msgid ""
 "by Mandriva Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:560
-#, fuzzy, c-format
+#: ../rpmdrake.pm:576
+#, fuzzy
 msgid "Please choose the desired mirror."
 msgstr "калі ласка, пазначце тып вашай мышы."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:628
-#, fuzzy, c-format
+#: ../rpmdrake.pm:644
+#, fuzzy
 msgid " done."
 msgstr "Зроблена"
 
-#: ../rpmdrake.pm:632
-#, fuzzy, c-format
+#: ../rpmdrake.pm:648
+#, fuzzy
 msgid " failed!"
 msgstr "mkraid не працаздольны"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:658
-#, fuzzy, c-format
+#: ../rpmdrake.pm:674
+#, fuzzy
 msgid "Please wait, updating media..."
 msgstr "Падрыхтоўка ўсталяваньня"
 
-#: ../rpmdrake.pm:685
-#, fuzzy, c-format
+#: ../rpmdrake.pm:701
+#, fuzzy
 msgid "Error retrieving packages"
 msgstr "Атрымалася памылка ўпарадкавання пакетаў:"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2203,34 +2035,32 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, fuzzy, c-format
+#: ../rpmdrake.pm:733
+#, fuzzy
 msgid "Update media"
 msgstr "Іншыя"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, fuzzy, c-format
+#: ../rpmdrake.pm:745
+#, fuzzy
 msgid "Select the media you wish to update:"
 msgstr "Пазначце карыстальнікаў каб аб'яднаць у гэтыю групу"
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr "Абярыце файл"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Аднавіць"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2238,55 +2068,52 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, fuzzy, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, fuzzy, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr "Немагчыма адчыніць файл %s\n"
 
-#: ../rpmdrake.pm:814
-#, fuzzy, c-format
+#: ../rpmdrake.pm:830
+#, fuzzy
 msgid "Unable to create medium."
 msgstr "Немагчыма адчыніць файл %s\n"
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2573,6 +2400,17 @@ msgstr "/Выдаліць дохлыя файлы"
 msgid "Software Media Manager"
 msgstr ""
 
+#~ msgid "Stop"
+#~ msgstr "Спыніць"
+
+#, fuzzy
+#~ msgid "Normal information"
+#~ msgstr "Інфармацыя аб памяці"
+
+#, fuzzy
+#~ msgid "Maximum information"
+#~ msgstr "Інфармацыя аб DMA"
+
 #, fuzzy
 #~ msgid "Regenerate hdlist"
 #~ msgstr "Асноўныя пашырэнні"
diff --git a/po/bg.po b/po/bg.po
index be504b03..71358b9c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-bg\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-01-28 15:12+0200\n"
 "Last-Translator: Dimitar Terziev <mitak@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -20,13 +21,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Избор на носител"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -49,18 +48,16 @@ msgstr ""
 "източника, но чрез две\n"
 "стъпки.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Източници на дистрибуцията"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Официални обновявания"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -78,107 +75,89 @@ msgstr ""
 "в интернет.\n"
 "Да продължа ли ?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Моля, изчакайте. Обновява се източник..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Добавяне на източник"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Локални файлове"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Път:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP сървър"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "FTP сървър"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP сървър"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Преместваемо устройство"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Път или точка на монтиране:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Преместваемо устройство"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Търси..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Потребителско име:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Релативен път до директория или hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 "Ако бъде оставено празно, synthesis/hdlist ще бъдат автоматично потърсени."
 
 # c-format
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Име:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Създаване на източник за цялята дистрибуция"
 
 # c-format
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Моля изберете източници които искате да се подновят:"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Трябва да попълните поне първите 2 точки."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -186,13 +165,11 @@ msgstr ""
 "Вече има източник с това име.Наистина ли\n"
 "желаете да го замените?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Добавяне на източник:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Тип на източника:"
 
@@ -200,10 +177,9 @@ msgstr "Тип на източника:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Отказ"
 
@@ -212,82 +188,70 @@ msgstr "Отказ"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Добре"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Глобални настройки за инсталация на пакети"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "винаги"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "никога"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Проверка на RPM пакет за инсталация:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Сваляне на програма:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Премахване на източник"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Сигурни ли сте,че желаете да изтриете източник \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr ""
 "Моля Изчакайте\n"
 "Премахва се източник"
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Редактиране на източник"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Редактиране на източник \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Запазва промените"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Прокси..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Вие трябва да поставите източника за да продължите"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
@@ -295,22 +259,19 @@ msgstr ""
 "устройството."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Конфигуриране на проксита"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Прокси настройки за източник \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Глобални прокси настройки"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -319,169 +280,140 @@ msgstr ""
 "<proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Адрес на прокси:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Вие трябва да зададете име/парола за идентификация пред проксито:"
 
 # c-format
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Потребител:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Добавяне на паралелна група"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Редактиране на паралелна група"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Добавя ограничение на източници"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Изберете източник за добавяне към лимита на източници:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Добавяне на хост"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Вид на хоста или IP адреса за добавяне:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Редактиране на паралелна група \"%s\":"
 
 # c-format
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Име на група:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Протокол:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Лимит на източници:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Добави"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Изтрива"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Хостове:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Настройка на паралелно urpmi (споделено изпълнение на urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Група"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Протокол"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Лимит на източници"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Протокол"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(няма)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Редактира"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Добавя..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Работа с ключове за електронните подписи на пакетите"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Среден"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 "не бе намерено име,следователно ключът не съществува в rpm ключодържателя"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Добавяне на ключ"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Изберете ключ за добавяне към източник %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Изтриване на ключ"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -490,37 +422,32 @@ msgstr ""
 "(име на ключа: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Добавяне на ключ..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Изтрива ключ"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Настройка на източник"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Да разреша?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Обновяване"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -530,38 +457,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Добавя..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Обновяване..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Работа с ключове..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Паралелно..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Глобални настройки..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Помощ"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -571,8 +492,7 @@ msgstr ""
 "\n"
 "Да продължа ли?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -586,8 +506,7 @@ msgstr ""
 "които ще използвате.След това те ще бъдат ползвани при инсталиране\n"
 "или обновяване на пакети."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -598,13 +517,23 @@ msgstr ""
 "изполават базата с пакеите (проверете дали не сте стартирали менажера на "
 "пакети повече от веднъж?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Източникът нее може да бъде добавен - грешни или липсващи аргументи"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Добавяне на нов източник на пакети `%s'.\n"
+"Благодарение на това ще можете да инсталирате нов софтуер\n"
+"на вашият компютър."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -614,92 +543,85 @@ msgstr ""
 "Благодарение на това ще можете да инсталирате нов софтуер\n"
 "на вашият компютър."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Източникът `%s' е добавен успешно."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Източникът `%s' е добавен успешно."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Изпозлване: %s [ОПЦИЯ]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, fuzzy, c-format
+#: ../rpmdrake:44
+#, fuzzy
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - обновява само източниците за обновяване.\n"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, fuzzy, c-format
+#: ../rpmdrake:49
+#, fuzzy
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                      DrakBackup Рапорт \n"
 "\n"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "В потребителски режим"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -709,636 +631,519 @@ msgstr ""
 "Няма да имате права да правите промени,\n"
 "все пак може да разгледате съществуващата база."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Достъпност"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Архивиране"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Резервно копиране"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Запис на дискове"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Компресия"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Друг"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Книги"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Компютърни книги"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Често задавани въпроси ( с отговори)"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Документи от вида \"Как да...\""
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Литература"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Клъстер"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Съобщение"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Изчакващи услуги"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Комуникации"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Базата данни"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Разработки"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Разработки"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "ГНОМ и GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "КДЕ и Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Ядро"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Питон"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Редактори"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Обучение"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Емулатори"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Инструменти за работа с файлове"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Игри"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Приключенски"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Игри"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Аркадни"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "На дъска"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Карти"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Пъзели"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Спортни"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Стратегия"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Графичен работен плот"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Графичен работен плот"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM базирано"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "ГНОМ"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Графики"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Наблюдение"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Мултимедия"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Мрежа"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Чат"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Мрежа"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Трансфер на файлове"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Моментни съобщения"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Е-поща"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Новини"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Отдалечен достъп"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Офис"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Публични ключове"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Издателски"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Науки"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Астрономия"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Науки"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Биология"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Химия"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Компютърни науки"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Гео науки"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Шелове"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Звук"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Система"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Основа"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Настройка"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Система"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Зареждане"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Настройка"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Хардуер"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Работа с пакети"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Печатане"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Разработки"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Разгръщане"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Шрифтове"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Конзола"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Шрифтове"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Тип1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Х11 битмап"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Интернационализация"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Ядро и хардуер"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Библиотеки"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Сървъри"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Терминали"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Инструменти за работа с текст"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Играчки"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Не е наличен)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Резултат от търсене"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Резултат от търсенето (няма)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Моля изчакайте, търся..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Стоп"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Възможни за добавяне"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Обновим"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Възможни за добавяне"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Не е избрано"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Избрано"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Не е избрано"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Важност: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Причина за обновяване: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Без описание"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Файлове:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Списък с промени:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Източник:"
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Текущо инсталирана версия: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Име: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Версия: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Размер: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Важност: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Размер: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Резюме: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Причина за обновяване: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Описание: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Без описание"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Повече информация от пакет..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Моля изберете"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Един от следните пакети е необходим:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Моля изберете"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Няма обновления"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1348,29 +1153,24 @@ msgstr ""
 "обновления за инсталираните пакети,или вече сте ги \n"
 "инсталирали."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Всичко"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Повече информация"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Информация за пакетите"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Някой допълнителни пакети трябва да се изтрият"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1380,13 +1180,11 @@ msgstr ""
 "следните пакети трябва бъдат премахнати:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Някои пакети не могат да бъдат деинсталирани"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1394,8 +1192,7 @@ msgstr ""
 "Премахването на тези пакети би разбило системата ви, съжалявам:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1405,13 +1202,11 @@ msgstr ""
 "от избора сега:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Трябва допълнителни пакети"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1421,18 +1216,17 @@ msgstr ""
 "да бъдат инсталирани:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (към листа с пропуснатите)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Някои пакети не могат да бъдат инсталирани"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1442,123 +1236,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Някои пакети трябва да бъдат премахнати"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Избрани: %d МБ / Свободно дисково пространство: %d МБ"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Общ размер %d МБ"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Няма описание на този пакет\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Обновявания свързани със сигурността"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Обновяванията свързани със подобрения"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Инсталация"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Стандартни обновявания"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Инсталация"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s избрани"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Мандрива Линукс избрани"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Всички пакети по азбучен ред"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Всички пакети,сортирани по група"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Всички пакети по възможност за обновяване"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Всички пакети,подредени по размер"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Всички пакети, подредени по състояние на избора"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Всички пакети подредени по източник на съхранение"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Всички пакети по възможност за обновяване"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Само \"листа\",сортирани по инсталационна дата"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Всички пакети,сортирани по група"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Стандартни обновявания"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Обновяванията свързани със подобрения"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Стандартни обновявания"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Обновявания свързани със сигурността"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "по имена"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "в описанията"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "във файловите имена"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Нормална информация"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Максимум информация"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Трябва да изберете някакви пакети."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Твърде много пакети са избрани"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1575,7 +1354,7 @@ msgstr ""
 "Действително ли желаете да инсталирате всички избрани пакети ?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1590,89 +1369,100 @@ msgstr ""
 "\n"
 "Желаете ли да продължите?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Обновяване на източниците"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Анулира избраното"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Презарежда списък с пакетите"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Изход"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Настройки"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Покажи автоматично отбелязаните пакети"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/Помощ"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Мандрива Линукс обновяване"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Търси:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Търси"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Изчистване"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Инсталация"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Изход"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Фатална грешка"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Получи се непоправима грешка: %s"
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1684,13 +1474,12 @@ msgstr ""
 "в момента\n"
 ". Желаете ли да продължа?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Вече съществува този източник за обновяване"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1706,13 +1495,12 @@ msgstr ""
 "\n"
 "След това рестартирайте %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Как да изберете ръчно вашият огледален сървър"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1726,60 +1514,60 @@ msgstr ""
 "\n"
 "След това рестартирайте %s"
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr ""
+"Моля изчакайте\n"
+"Пакетите се сортират"
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Преглеждам %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "промени:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Премахва .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Използва .%s като главен файл"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Не прави нищо"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Инсталацията приключи"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Преглежда..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Всички заявени пакети бяха инсталирани коректно."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Появиха се проблеми по време на инсталацията"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1789,18 +1577,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Не мога да получа пакетите."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Съжалявам,не мога да получа пакетите. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1812,38 +1599,34 @@ msgstr ""
 "Грешки:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Инсталиране на пакети..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Инициализация:"
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Инсталиране на пакети..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Сменя източник"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Изтегляне на пакет `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Проверка подписите на пакетите..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1857,13 +1640,12 @@ msgstr ""
 "\n"
 "Искате ли да продължите въпреки това ?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Инсталацията пропадна"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1875,23 +1657,22 @@ msgstr ""
 "\n"
 "Вие трябва да обновите базата данни на вашия източник."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Подготвяне на пакетите за инсталация..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталиране на пакет `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm файлът [%s] е недостъпен"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1903,48 +1684,36 @@ msgstr ""
 "Някой конфигурационни файлове бяха създадени като .rpmnew' или `.rpmsave'.\n"
 "Вие трябва да прегледате някой от тях за да предприемете действие:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Има информация за обновяване на тези пакети"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Повече информация от пакет... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Не бе намерен пакет за инсталиране."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Непоправима грешка : не е намерен пакета за инсталация,много съжалявам."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Моля изчакайте\n"
-"Пакетите се сортират"
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Появиха се проблеми по време на премахването"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1954,8 +1723,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1967,8 +1735,8 @@ msgstr ""
 "Този инструмент ще ви помогне да изберете кои софтуерни пакети искате да\n"
 "изтриете от системата."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1980,13 +1748,11 @@ msgstr ""
 "Този инструмент ще ви помогне да изберете обновяване на вашият софтуер\n"
 "върху системата."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Добре дошли в помощника за инсталиране на софтуер!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -2001,214 +1767,174 @@ msgstr ""
 "пакети\n"
 "вие искате да инсталирате на системата."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Обновяване на софтуер"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Мандрива Линукс обновяване"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Обновяване на софтуер"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Моля, въведете долу вашият адрес на Ел. поща"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Потребител:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Изтриване на пакети"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Обновяване на пакети"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Инсталиране на софтуерни пакети"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Да"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Информация..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Австрия"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Австралия"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Белгия"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Швейцария"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Чехия"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Германия"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Дания"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Гърция"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Испания"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Финландия"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Франция"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Унгария"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Израел"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Италия"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Япония"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Корея"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Холандия"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Норвегия"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Полша"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Португалия"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Русия"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Тайван"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Обединеното кралство"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Китай"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "САЩ"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2220,8 +1946,7 @@ msgstr ""
 "в интернет.\n"
 "Да продължа ли ?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2233,23 +1958,26 @@ msgstr ""
 "в интернет.\n"
 "Да продължа ли ?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s избрани"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Моля, почакайте. Изтеглям огледалните адреси ."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Моля, почакайте. Изтеглям огледалните адреси от web сайта на Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Грешка при изтегляне"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2263,8 +1991,8 @@ msgstr ""
 "Или имате проблем с мрежата,или Мандрива в момента има\n"
 "такъв.Моля опитайте по-късно."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2278,18 +2006,15 @@ msgstr ""
 "Или имате проблем с мрежата,или Мандрива в момента има\n"
 "такъв.Моля опитайте по-късно."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Няма огледален сървър"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Не мога да открия подходящо огледало."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2303,71 +2028,66 @@ msgstr ""
 "това,че процесорната ви архитектура не се поддържа\n"
 "от официалните обновления на Мандрива Линукс."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr ""
 "Моля изчакайте\n"
 "Получавам списъка с огледални сървъри"
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Копиране на файл за източник '%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Проверявам файла от източника %s..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Проверка на файла от източник %s..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " край."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " провал!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s от източник %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Започва свалянето на `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Сваляне на '%s',оставащо време: %s,скорост: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Сваляне на '%s',със скорост %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Моля, изчакайте. Обновява се източник..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Грешка при получаване напакетите"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2380,35 +2100,30 @@ msgstr ""
 "`%s'. В случаи, че този източник е нрправилно конфигуриран,\n"
 "можете да го премахнете, и да го добавите отново."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Обновяване на източниците"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
 # c-format
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Моля изберете източници които искате да се подновят:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Избери всички"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Обновяване"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2420,8 +2135,8 @@ msgstr ""
 "Грешки:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2431,18 +2146,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Невъзможност за създаване на източник."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Грешка при добавяне на източник"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2452,8 +2165,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2463,8 +2176,8 @@ msgstr ""
 "s), която използвате (%s).\n"
 "Ще бъде премахнат."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2474,13 +2187,11 @@ msgstr ""
 "на Mandriva Linux (%s).\n"
 "Ще бъде премахнат."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Помощ,стартирана във фонов режим"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2757,6 +2468,18 @@ msgstr "Изтрива софтуер"
 msgid "Software Media Manager"
 msgstr "Мениджър за софтуерни източници"
 
+#~ msgid "Stop"
+#~ msgstr "Стоп"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Всички пакети подредени по източник на съхранение"
+
+#~ msgid "Normal information"
+#~ msgstr "Нормална информация"
+
+#~ msgid "Maximum information"
+#~ msgstr "Максимум информация"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "всички бяха инсталирани коректно"
 
diff --git a/po/bn.po b/po/bn.po
index 3e44b599..c0d15a65 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake VERSION\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-03-05 23:21+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -14,13 +15,11 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "মাধ্যমের ধরন বাছাই করুন"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -42,18 +41,16 @@ msgstr ""
 "করবে, তা বাছাই করতে পারেন। (আপনি দুটোই যোগ করতে পারেন, কিন্তু আপনাকে এটি দুই "
 "ধাপে করতে হবে।)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "ডিস্ট্রিবিউশনের উত্‍‌স সমুহ"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "অফিসিয়াল আপ-ডেট সমুহ"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -71,106 +68,88 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "মাধ্যম যোগ করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "একটি মাধ্যম যোগ করুন"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "স্থানীয় ফাইল"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "পাথ:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "এফটিপি (FTP) সার্ভার"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "ইউআরএল (URL):"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "এফটিপি (FTP) সার্ভার"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "এইচটিটিপি (HTTP) সার্ভার"
 
+#: ../edit-urpm-sources.pl:136
+msgid "Path or mount point:"
+msgstr "পাথ অথবা মাউন্ট পয়েন্ট:"
+
 # sgstr "অপসারণযোগ্য ডিভাইস"
 # মুছে ফেলা যাবে এমন ডিভাইস
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Removable device"
 msgstr "অপসারণযোগ্য ডিভাইস"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Path or mount point:"
-msgstr "পাথ অথবা মাউন্ট পয়েন্ট:"
-
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "ব্রাউজ..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "লগ-ইন:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist-এর জন্য আপেক্ষিক পাথ:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "না লেখা হলে, স্বয়ংক্রিয়ভাবে synthesis/hdlist-এর অনুসন্ধান করা হবে"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "নাম:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "পুরো ডিস্ট্রিবিউশনের জন্য মাধ্যম তৈরি করো"
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "যে মাধ্যমটি আপনি আপ-ডেট করতে ইচ্ছুক তা নির্বাচন করুন:"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "অন্তত প্রথম দুটি এন্ট্রি আপনার পুরণ করা আবশ্যক।"
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -178,13 +157,11 @@ msgstr ""
 "এই নামের একটি মাধ্যম বর্তমানে উপস্থিত আছে, আপনি কি এটি\n"
 "বদল করে পুনরায় স্থাপন করার বিষয়ে নিশ্চিত? "
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "নতুন মাধ্যম যোগ করা হচ্ছে:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "মাধ্যমের ধরন:"
 
@@ -192,10 +169,9 @@ msgstr "মাধ্যমের ধরন:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "বাতিল"
 
@@ -204,101 +180,86 @@ msgstr "বাতিল"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "ঠিক আছে"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "প্যাকেজ ইনস্টলেশন Global অপশন"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "সবসময়"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "কখনই নয়"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "ইনস্টল করার জন্য RPM সমুহের পরীক্ষন"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "ব্যবহার করার জন্য ডাউনলোড প্রোগ্রাম:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "সোর্স প্যাকেজ মুছে ফেলা"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "সোর্স প্যাকেজ \"%s\" সরিয়ে ফেলার বিষয়ে কি আপনি নিশ্চিত?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "মাধ্যম মুছে ফেলা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "মাধ্যম সম্পাদন করুন"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" মাধ্যমটি সম্পাদন করা হচ্ছে:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "পরিবর্তনগুলো সংরক্ষণ করো"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "প্রক্সি..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "পরবর্তী ধাপে এগোতে হলে আপনাকে একটি মাধ্যম ঢোকাতে হবে"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "পরিবর্তনগুলো সংরক্ষণ করতে হলে, আপনাকে একটি মাধ্যম ড্রাইভে ঢোকাতে হবে।"
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "প্রক্সি কনফিগার করো"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "\"%s\" মাধ্যমের প্রক্সি বৈশিষ্ট্যাবলীসমুহ"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Global প্রক্সির বৈশিষ্ট্যাবলীসমুহ"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -307,168 +268,139 @@ msgstr ""
 "<proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "প্রক্সির হোস্টের নাম:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "প্রক্সির অনুমোদনের জন্য আপনাকে একটি ব্যবহারকারীর নাম/পাসওয়ার্ড নির্ধারণ করতে হবে:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "ব্যবহারকারী:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "একটি সমান্তরাল দল যোগ করো"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "একটি সমান্তরাল দল সম্পাদন করো"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "মাধ্যমের সীমা যোগ করো"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "মাধ্যমের সীমায় যোগ করার জন্য একটি মাধ্যম নির্বাচন করুন"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "একটি হোস্ট যোগ করুন"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "যে হোস্টকে আপনি যোগ করতে ইচ্ছুক, তার নাম অথবা আইপি (IP) অ্যাড্রেস লিখুন:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "সমান্তরাল দল \"%s\"-কে সম্পাদন করা হচ্ছে:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "দলের নাম:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "প্রোটোকল:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "মাধ্যমের সীমা:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "যোগ করো"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "মুছে ফেলো"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "হোস্ট:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "সমান্তরাল urpmi কনফিগার করো (urpmi এর বিতরণকৃত চালনা)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "দল"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "প্রোটোকল"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "মাধ্যমের সীমা"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "প্রোটোকল"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "কমান্ড"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(একটিও নয়)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "সম্পাদনা"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "যোগ করো..."
 
 # সিগনেচারের
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "প্যাকেজের ডিজিটাল সাক্ষরের জন্য কী ব্যবস্থাপনা কর"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "মাধ্যম"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "কোন নাম পাওয়া যায়নি, rpm কীরিং (keyring) এ কী (key)-টি নেই!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "একটি কী (key) যোগ করুন"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "%s মাধ্যমে যোগ করার জন্য একটি কী (key) নির্বাচন করুন"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "একটি কী (key) মুছে ফেলুন"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -477,38 +409,33 @@ msgstr ""
 "(কী (key)-এর নাম: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "একটি কী (key) যোগ করুন..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "কী (key) মুছে ফেলুন"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "মাধ্যম কনফিগার করো"
 
 #  আছে কি
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "সক্রিয়?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "আপডেট"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -518,38 +445,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Custom যোগ করো..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "আপডেট করো..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "কী ব্যবস্থাপনা..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "সমান্তরাল..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Global অপশন সমুহ..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "সহায়িকা"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -560,8 +481,7 @@ msgstr ""
 "অগ্রসর হওয়া যাবে কি?"
 
 # উপলব্ধ
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -575,8 +495,7 @@ msgstr ""
 "সেগুলো আপনি এই টুলটির সাহায্যে কনফিগার করতে পারবেন। নতুন সফ্টওয়্যার\n"
 "প্যাকেজ ইনস্টল করতে অথবা আপডেট করার সময় এগুলো থাকবে।"
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -588,13 +507,23 @@ msgstr ""
 "কোন ডেস্কটপে কি আরেকটি মিডিয়া ম্যানজার চলছে, অথবা আপনি কি\n"
 "বর্তমানে প্যাকেজ ইনস্টল করছেন?)।"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "মাধ্যম যোগ করা সম্ভব হয়নি, আর্গুমেন্ট সঠিক নয় অথবা অনুপস্থিত"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"আপনি একটি নতুন প্যাকেজ মাধ্যম `%s' যোগ করতে চলেছেন।\n"
+"আপনি এই মাধ্যমের থেকে আপনার সিষ্টেমে নতুন সফ্টওয়্যার প্যাকেজ\n"
+"ইনস্টল করতে সক্ষম হবেন।"
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -604,91 +533,85 @@ msgstr ""
 "আপনি এই মাধ্যমের থেকে আপনার সিষ্টেমে নতুন সফ্টওয়্যার প্যাকেজ\n"
 "ইনস্টল করতে সক্ষম হবেন।"
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "`%s' মাধ্যমটি সাফল্যের সাথে যোগ করা হয়েছে।"
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "`%s' মাধ্যমটি সাফল্যের সাথে যোগ করা হয়েছে।"
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "ব্যবহার: %s [অপশনসমূহ] ..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, fuzzy, c-format
+#: ../rpmdrake:44
+#, fuzzy
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - শুধুমাত্র আপডেট মাধ্যম আপডেট করো।\n"
 
-#: ../rpmdrake:42
-#, fuzzy, c-format
+#: ../rpmdrake:45
+#, fuzzy
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, fuzzy, c-format
+#: ../rpmdrake:49
+#, fuzzy
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                      ড্র্যাকব্যাকআপ ডেম্যন রিপোর্ট\n"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "ব্যবহারকারীর মোডে চলছে"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -700,646 +623,529 @@ msgstr ""
 
 # sgstr "ব্যবহারযোগ্যতা"
 # sgstr "প্রবেশাধিকার"
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "ব্যবহার যোগ্যতা"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "আর্কাইভ করা"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "ব্যাক-আপ"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "সিডি (CD) বার্ণ করা"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "কম্প্রেশন"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "বই"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "কম্পিউটার সংক্রান্ত বই"
 
 # sgstr "প্রয়োজনীয় প্রশ্নাবলী"
 # sgstr "সাধারণ প্রশ্নাবলী"
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "সাহিত্য"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "ক্লাস্টার"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "তথ্য সঞ্চালন"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "সারিকরন সার্ভিস"
 
 # sgstr "সংযোগ-ব্যবস্থা"
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "যোগাযোগ"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "ডাটাবেস"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "ডেভেলপমেন্ট"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "ডেভেলপমেন্ট"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "গুনোম এবং GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "জাভা (Java)"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "কেডিই (KDE) এবং Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "কার্নেল"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "এডিটর"
 
 # sgstr "সংযোগ-ব্যবস্থা"
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "শিক্ষা"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "এমুলেটর"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "ফাইল সংক্রান্ত টুল"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "খেলা"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "রোমাঞ্চ"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "খেলা"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "আর্কেড"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "ছক"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "তাস"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "ধাঁধা"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "খেলা"
 
 # sgstr "রণচাতুর্য"
 # sgstr "পরিচালন-দক্ষতা"
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "কৌশল"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "গ্রাফিক্যাল ডেস্কটপ"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "জ্ঞানবৃদ্ধি"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "গ্রাফিক্যাল ডেস্কটপ"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM ভিত্তিক"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "গুনোম"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "কেডিই (KDE)"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "স-ফিশ"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "উইন্ডোমেকার"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "গ্রাফিক্স"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "পর্যবেক্ষণ"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "মাল্টিমিডিয়া"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "নেটওয়ার্ক করা"
-
 # আলাপন
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "আড্ডা (chat)"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "নেটওয়ার্ক করা"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "ফাইল আদানপ্রদান"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "আইআরসি (IRC)"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "ইনস্ট্যন্ট মেসেজ করা"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "মেইল"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "খবরাখবর (news)"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "দূরবর্তী প্রবেশ"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "অফিস"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "পাবলিক কীসমুহ"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "প্রকাশনা"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "বিজ্ঞান"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "জ্যোতির্বিদ্যা"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "বিজ্ঞান"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "জীববিজ্ঞান"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "রসায়ন"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "কম্পিউটার বিজ্ঞান"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "ভূবিজ্ঞানসমূহ"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "অঙ্কশাস্ত্র"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "পদার্থবিদ্যা"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "শেল"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "শব্দ"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "সিস্টেম"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "ভিত্তি"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "কনফিগারেশন"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "সিস্টেম"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Boot এবং Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "কনফিগারেশন"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "হার্ডওয়্যার"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "প্যাকেজ করা"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "প্রিন্ট করা"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "ডিপ্লয়মেন্ট"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "ডিপ্লয়মেন্ট"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "ফন্ট"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "কনসোল"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "ফন্ট"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "ট্রু টাইপ"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 বিটম্যাপ"
 
 # sgstr "অন্তর-রাষ্ট্রিয়করণ"
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "আন্তর্জাতিকীকরণ"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "কার্নেল এবং হার্ডওয়্যার"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "লাইব্রেরি"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "সার্ভার"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "টার্মিন্যাল"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "টেক্সট সংক্রান্ত টুল"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "খেলনা"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "ভিডিও"
 
 # উপলব্ধ 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(নেই)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "অনুসন্ধানের ফলাফল"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "অনুসন্ধানের ফলাফল (শূন্য)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "অনুসন্ধান করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "থামো"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "যোগ করা সম্ভব"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "আপগ্রেডযোগ্য"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "যোগ করা সম্ভব"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "নির্বাচিত নয়"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "নির্বাচিত"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "নির্বাচিত নয়"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "গুরুত্ত্ব: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "আপডেট করার কারন: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "বিবরণ নেই"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "ফাইল:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "পরিবর্তনলিপি:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "মাধ্যম: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "বর্তমানে ইনস্টল করা ভার্সান: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "নাম: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "ভার্সান: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-# মাপ
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "আকার: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s কিলোবাইট"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "গুরুত্ত্ব: "
+# মাপ
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "আকার: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "সারাংশ: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "আপডেট করার কারন: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "বিবরণ: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "বিবরণ নেই"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
 # অতিরিক্ত
 # বিস্তারিত
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "প্যাকেজ সমন্ধে আরো তথ্য..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "অনুগ্রহ করে নির্বাচন করুন"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "নিম্নোক্ত প্যাকেজগুলোর মধ্যে একটির প্রয়োজন আছে:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "অনুগ্রহ করে নির্বাচন করুন"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "প্যাকেজের তালিকা তৈরি করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "কোন আপডেট নেই"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1349,31 +1155,26 @@ msgstr ""
 "আপনার কম্পিউটারে ইনস্টল করা প্যাকেজগুলোর জন্য কোন আপডেট\n"
 "উপস্থিত নেই অথবা আপনি ইতিমধ্যাই  আপডেটগুলোকে ইনস্টল করে নিয়েছেন।"
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "সকল"
 
 #  -PO: Keep it short, this is gonna be on a button
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "অতিরিক্ত তথ্য"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "প্যাকেজ সম্বন্ধিয় তথ্য"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "কিছু বাড়তি প্যাকেজ মুছে ফেলা প্রয়োজন"
 
 # যোগসুত্রের
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1383,13 +1184,11 @@ msgstr ""
 "হবে:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "কিছু প্যাকেজ মুছে ফেলা সম্ভব নয়"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1398,8 +1197,7 @@ msgstr ""
 "\n"
 
 # ডিপেন্ডেনসির
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1409,13 +1207,11 @@ msgstr ""
 "এখনই বাদ দিতে হবে:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "অতিরিক্ত প্যাকেজের প্রয়োজন আছে"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1425,18 +1221,17 @@ msgstr ""
 "হবে:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (বাতিল তালিকায় উপস্হিত)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "কিছু প্যাকেজ ইনস্টল করা সম্ভব নয়"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1446,127 +1241,112 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "কিছু প্যাকেজ সরিয়ে ফেলতে হবে"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "নির্বাচিত: %d মেগাবাইট / ডিস্কে ফাঁকা জায়গা: %d মেগাবাইট"
 
 # মাপ
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "নির্বাচিত আকার: %d মেগাবাইট"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "এই প্যাকেজের বিস্তারিত বর্ণনা উপস্হিত নেই\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "নিরাপত্তা সংক্রান্ত আপডেট"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "বাগফিক্সসমূহের (Bugfixes) আপডেট"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "ইনস্টল করা"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "সাধারণ আপ-ডেট"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "ইনস্টল করা"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s পছন্দ"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux এর পছন্দতালিকা"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "সকল প্যাকেজ, প্রথম অক্ষর অনুযায়ী"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "সকল প্যাকেজ, দল অনুযায়ী"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "সকল প্যাকেজ, আপডেট অনুযায়ী"
 
 # মাপ
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "সকল প্যাকেজ, আকার অনুযায়ী"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "সকল প্যাকেজ, নির্বাচনের অবস্থা অনুযায়ী"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "সকল প্যাকেজ, অবস্থানের মাধ্যম অনুযায়ী"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "সকল প্যাকেজ, আপডেট অনুযায়ী"
-
 # শুধুমাত্র পল্লব
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "শুধু Leaves, ইনস্টল তারিখের ক্রমে সাজানো"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "সকল প্যাকেজ, দল অনুযায়ী"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "সাধারণ আপ-ডেট"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "বাগফিক্সসমূহের (Bugfixes) আপডেট"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "সাধারণ আপ-ডেট"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "নিরাপত্তা সংক্রান্ত আপডেট"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "নামে"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "বিবরণে"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "ফাইলের নামে"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "সাধারণ তথ্য"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "সর্বাধিক তথ্য"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "প্রথমে আপনাকে কিছু প্যাকেজ নির্বাচন করতে হবে।"
 
 # সীমা বহির্ভুত
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "অতিরিক্ত সংখ্যক প্যাকেজ নির্বাচন করা হয়েছে"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1583,7 +1363,7 @@ msgstr ""
 "সত্যিই কি আপনি বাছাই করা সব গুলো প্যাকেজ ইনস্টল করতে চান?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1597,89 +1377,100 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/ফাইল (_ফ)"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_মাধ্যম আপডেট"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_বাছাইকৃত কে পূর্বাবস্থায় ফেরাও"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_প্যাকেজ সমুহের তালিকা পুনরায় লোড করো"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/প্রস্থান (_হ)"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/অপশন (_অ)"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_স্বয়ংক্রীয়ভাবে নির্বাচিত প্যাকেজগুলি দেখাও"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/সহায়িকা (_স)"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Update"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "অনুসন্ধান:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "অনুসন্ধান"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "পরিষ্কার করো"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "ইনস্টল করা"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "প্রস্থান"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "মারাত্মক ত্রুটি"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "একটি মারাত্মক ত্রুটি ঘটেছে: %s"
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1691,13 +1482,12 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "আপডেট মাধ্যম বর্তমানে উপস্থিত আছে"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1713,13 +1503,12 @@ msgstr ""
 "\n"
 "এর পরে %s পুনরায় চালু করুন।"
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "আপনার মিরর কিভাবে স্বহস্তে নির্বাচন করবেন"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1734,58 +1523,56 @@ msgstr ""
 "এরপর %s পুনরায় চালু করুন।"
 
 # উপলব্ধ
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "উপস্থিত প্যাকেজসমুহ খোঁজা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "প্যাকেজ সংক্রান্ত ডাটাবেসটি পড়া হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "%s পরীক্ষা করা হচ্ছে"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "পরিবর্তন:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr ".%s মুছে ফেলো"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr ".%s কে মূল ফাইল হিসেবে ব্যবহার কর"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "কিছু করণীয় নেই"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "পরীক্ষা করা..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "অনুরোধ করা সব প্যাকেজ সফল্যের সাথে ইনস্টল করা হয়েছে।"
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "ইনস্টলেশনের সময় সমস্যা হয়েছে"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1796,18 +1583,17 @@ msgstr ""
 "%s"
 
 # উত্‍সর
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "সোর্স প্যাকেজ আহরণ করা সম্ভব হয়নি।"
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "দুঃক্ষিত, সোর্স প্যাকেজ আহরণ করা সম্ভব হয়নি। %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1819,38 +1605,34 @@ msgstr ""
 "ত্রুটি(সমুহ) নথিভুক্ত করা হয়েছে:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "প্যাকেজ ইনস্টলেশন প্রক্রিয়া..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "আরম্ভ করা হচ্ছে..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "প্যাকেজ ইনস্টলেশন প্রক্রিয়া..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "মাধ্যম পরিবর্তন করো"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "অনুগ্রহ করে \"%s\" নামক মাধ্যমটি [%s] ডিভাইসে  প্রবেশ করান"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) প্যাকেজ ডাউনলোড করা হচ্ছে..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "প্যাকেজের স্বাক্ষর পরীক্ষা করা হচ্ছে..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1864,13 +1646,12 @@ msgstr ""
 "\n"
 "আপনি কি ইনস্টলেশন প্রক্রিয়া চালিয়ে যেতে ইচ্ছুক?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "ইনস্টলেশন বিফল হয়েছে"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1882,23 +1663,22 @@ msgstr ""
 "\n"
 "আপনি চাইলে আপনার মাধ্যমের ডাটাবেসটি আপডেট করতে পারেন।"
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "প্যাকেজ ইনস্টলেশন প্রক্রিয়ার জন্য প্রস্তুতি নেওয়া হচ্ছে..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) প্যাকেজ ইনস্টল করা হচ্ছে..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm ফাইল [%s] ব্যবহার করা যাচ্ছে নাহ্"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1910,45 +1690,35 @@ msgstr ""
 "`.rpmnew' or `.rpmsave' নামক কিছু কনফিগারেশন ফাইল তৈরি হয়েছে,\n"
 "যা পরীক্ষা করে আপনি আপনার কার্যাবলী নির্ধারণ করতে পারেন;"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "এই প্যাকেজগুলোতে নতুন তথ্য আছে"
 
 # অতিরিক্ত
 # বিস্তারিত
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "[%s] প্যাকেজ সমন্ধে আরো তথ্য..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "ইনস্টল করার জন্য কোন প্যাকেজ পাওয়া যায়নি।"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "অসংশোধনযোগ্য ত্রুটি: দুঃক্ষিত, ইনস্টল করার জন্য কোন প্যাকেজ পাওয়া যায়নি।"
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "প্যাকেজ সংক্রান্ত ডাটাবেসটি পড়া হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "প্যাকেজ মুছে ফেলা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "মুছে ফেলার সময় সমস্যা"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1958,8 +1728,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1971,8 +1740,8 @@ msgstr ""
 "আপনার কম্পিউটারের যেসকল সফ্টওয়্যার আপনি মুছে ফেলতে ইচ্ছুক, তা আপনি\n"
 "এই টুলের সাহায্যে নির্বাচন করতে পারবেন।"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1984,13 +1753,11 @@ msgstr ""
 "যে আপডেটগুলো আপনার কম্পিউটারে ইনস্টল করতে আপনি ইচ্ছুক, সেগুলোকে\n"
 "এই টুলের সাহায্যে নির্বাচন করতে পারবেন।"
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "সফ্টওয়্যার ইনস্টলেশন টুল এ স্বাগতম!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -2004,214 +1771,174 @@ msgstr ""
 "বেশি সংখ্যক সফ্টওয়্যার উপস্থিত থাকে। যে সফ্টওয়্যারগুলো আপনার কম্পিউটারে\n"
 "ইনস্টল করতে আপনি ইচ্ছুক, সেগুলোকে এই টুলের দ্বারা নির্বাচন করতে পারবেন।"
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "সফটওয়্যার আপডেট"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Update"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "সফটওয়্যার আপডেট"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "নীচে আপনার ইমেইল ঠিকানা প্রবেশ করুন"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "ইউজারের নাম"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "সফটওয়্যার প্যাকেজ মুছে ফেলা"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "সফটওয়্যার প্যাকেজ আপডেট"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "সফ্টওয়্যার প্যাকেজ ইনস্টলেশন"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "না"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "তথ্য..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "অস্ট্রিয়া"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "অস্ট্রেলিয়া"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "বেলজিয়াম"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "ব্রাজিল"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "কানাডা"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "সুইজারল্যান্ড"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "কস্টা রিকা"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "চেক প্রজাতন্ত্র"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "জার্মানি"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "ডেনমার্ক"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "গ্রীস"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "স্পেন"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "ফিনল্যান্ড"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "ফ্রাঁন্স"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "হাঙ্গেরী"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "ইজরায়েল"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "ইটালি"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "জাপান"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "কোরিয়া"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "নেদারল্যান্ড"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "নরওয়ে"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "পোল্যান্ড"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "পর্তুগাল"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "রাশিয়া"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "সুইডেন"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "সিঙ্গাপুর"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "স্লোভাকিয়া"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "তাইওয়ান"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "যুক্তরাজ্য"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "চীন"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "যুক্তরাষ্ট্র"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2223,8 +1950,7 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2236,25 +1962,28 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s পছন্দ"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "মিররের ঠিকানা সমুহ ডাউনলোড করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন।"
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Mandriva-এর ওয়েবসাইট থেকে মিররের ঠিকানা ডাউনলোড করা হচ্ছে, অনুগ্রহ করে অপেক্ষা  "
 "করুন।"
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "ডাউনলোডের সময় সমস্যা হয়েছে"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2268,8 +1997,8 @@ msgstr ""
 "নেটওয়ার্ক অথবা ওয়েবসাইটটি সম্ভবত বর্তমানে উপস্হিত নেই,\n"
 "অনুগ্রহ করে কিছুক্ষণ পরে পুনরায় চেষ্টা করুন।"
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2283,18 +2012,15 @@ msgstr ""
 "Mandriva-এর ওয়েবসাইট অথবা নেটওয়ার্কটি সম্ভবত বর্তমানে উপস্হিত নয়,\n"
 "অনুগ্রহ করে কিছুক্ষণ পরে পুনরায় চেষ্টা করুন।"
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "কোন মিরর নেই"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "আমি কোন মানানসই মিরর খুঁজে পাচ্ছি না।"
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2308,70 +2034,65 @@ msgstr ""
 "আপনার সিস্টেমের প্রসেসরের আর্কিটেকচার Mandriva Linux Official\n"
 "Updates -এর দ্বারা সমর্থন করে না।"
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "আকাঙ্ক্ষিত মিররটি নির্বাচন করুন।"
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' মাধ্যমের জন্য ফাইল কপি  করা হচ্ছে..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' মাধ্যমের জন্য ফাইল পরীক্ষা করা হচ্ছে..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' মাধ্যমের জন্য দূরবর্তী ফাইল পরীক্ষা করা হচ্ছে..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " সম্পন্ন।"
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " বিফল!"
 
 #  -PO: We're downloading the said file from the said medium
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s, %s মাধ্যম থেকে"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' এর ডাউনলোড আরম্ভ করা হয়েছে..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s'-এর ডাউনলোড, অবশিষ্ট সময়:%s, গতি:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' এর ডাউনলোড, গতি: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "মাধ্যম আপডেট করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "প্যাকেজ আহরণ করতে সমস্যা হয়েছে"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2387,34 +2108,29 @@ msgstr ""
 "যোগ করতে হবে। এটি সম্ভবত বর্তমানে উপস্হিত নয় এবং\n"
 "আপনাকে কিছুক্ষণ পরে আবার চেষ্টা করতে হবে।"
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "মাধ্যম আপডেট করো"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "যে মাধ্যমটি আপনি আপ-ডেট করতে ইচ্ছুক তা নির্বাচন করুন:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "সবকিছু নির্বাচন করো"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "আপডেট"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2426,8 +2142,8 @@ msgstr ""
 "ত্রুটিসমুহ:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2437,18 +2153,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "মাধ্যম তৈরি করা যায়নি"
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "মাধ্যম যোগ করার প্রক্রিয়া বিফল হয়েছে"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2458,8 +2172,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2469,8 +2183,8 @@ msgstr ""
 "সাথে মিলছে নাহ্।\n"
 "একে নিষ্ক্রয় করা হবে।"
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2480,13 +2194,11 @@ msgstr ""
 "এর সাথে মিলছে নাহ্।\n"
 "একে নিষ্ক্রয় করা হবে।"
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "পটভূমিতে সহায়িকা আরম্ভ করা হয়েছে"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2764,6 +2476,18 @@ msgstr "সফ্টওয়্যার সরিয়ে ফেলো"
 msgid "Software Media Manager"
 msgstr "সফ্টওয়্যার মিডিয়া ম্যানেজার"
 
+#~ msgid "Stop"
+#~ msgstr "থামো"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "সকল প্যাকেজ, অবস্থানের মাধ্যম অনুযায়ী"
+
+#~ msgid "Normal information"
+#~ msgstr "সাধারণ তথ্য"
+
+#~ msgid "Maximum information"
+#~ msgstr "সর্বাধিক তথ্য"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "সবকিছু সঠিকভাবে ইনস্টল করা হয়েছে"
 
diff --git a/po/br.po b/po/br.po
index 7dbb8260..4791cc12 100644
--- a/po/br.po
+++ b/po/br.po
@@ -9,7 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2006-07-09 03:43+0200\n"
 "Last-Translator: Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Language-Team: Brezhoneg <ofisk.bzh@wanadoo.fr>\n"
@@ -17,13 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Dibab rizh ar media"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -37,18 +36,16 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Hizivaat ofisiel"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -59,116 +56,94 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Gortozit mar plij, emaon oc'h ouzhpennañ ur media ..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Ouzhpennañ un medium"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Restroù lec'hel"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Hent :"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Servijer FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL :"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "Servijer RSYNC"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Servijer HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Trobarzhell lem-laka"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Hent pe poent marc'hañ :"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Trobarzhell lem-laka"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Ergerzhet .."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Anv ereañ :"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Tremenger :"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Anv :"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Klask er media-mañ evit bremañaat"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Red eo deoc'h leuniañ an div vouetadur-se d'an nebeutañ."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "O ouzhpennañ ur medium :"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Seurt ar medium :"
 
@@ -176,10 +151,9 @@ msgstr "Seurt ar medium :"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Nullañ"
 
@@ -188,101 +162,86 @@ msgstr "Nullañ"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Mat eo"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Dibarzhoù hollek evit staliadur ar pakadoù"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "bepred"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "gwech ebet"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Gwiriekaat ar pakadoù da staliañ :"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Enkargañ ar goulev da implij :"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Lemel un tarzh"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ha sur oc'h bezañ mennet da zilemel an tarzh « %s » ?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Gortozit mar plij, o lemel ar medium ..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Aozañ ar medium"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "O aozañ ar medium « %s » :"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Skrivañ kemmoù"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Proksi ..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Red eo deoc'h enlakaat ar vedium evit kenderc'el"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Red eo deoc'h enlakaat ar vedium evit enrollañ ar c'hemmoù."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Kefluniañ proksioù"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Dibarzhoù proksi evit ar vedia « %s »"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Dibarzhoù hollek ar proksi"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -291,166 +250,138 @@ msgstr ""
 "<ostizproksi[:porzh]>) :"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Anv ostiz ar proksi :"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Gallout a rit lakaat un arveriad/tremenger evit ar proksi :"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Arveriad :"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:556
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a medium limit"
 msgstr "Ouzhpennañ un arveriad"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Ouzhpennañ un ostiz"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Roit anv an ostiz pe chomlec'h IP an ostiz da ouzhpennañ :"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Anv ar strollad :"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Komenad :"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Ouzhpennañ"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Lemel"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Ostizoù :"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Strollad"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Komenad"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Komenad"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Urzhiad"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(hini ebet)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Kemmañ"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Ouzhpennañ ..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Merañ an alc'hwezioù evit sinadurioù ar pakadoù"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Medium"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Alc'hwezoù"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Ouzhpennañ ur douchenn"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Dibab un alc'hwez evit ouzphennañ d'ar medium %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Lemel ur douchenn"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -459,37 +390,31 @@ msgstr ""
 "(anv an alc'hwez : %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Ouzhpennañ ur alc'hwez ..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Lemel ur douchenn"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Kefluniañ ar media"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Bevaatet ?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Hizivaat ?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -499,38 +424,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Ouzhpennañ un hini diouzhoc'h ..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Bremanaat ..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Merañ an alc'hwezioù"
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Dibarzhoù hollek ..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Skoazell"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -540,8 +459,7 @@ msgstr ""
 "\n"
 "Kenderc'hel?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -550,8 +468,7 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -559,816 +476,689 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
 "to your system from that new medium."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, perl-format
+msgid "Successfully added media %s."
+msgstr ""
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Arveriadur : %s [DIBARZHOÙ] ..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Haezadusted"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Diellerezh"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Saveteiñ"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Engravañ CDoù"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Gwaskerezh"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "All"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Levrioù"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Levrioù an urzhiater"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "FAQoù"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Lennegezh"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Kehentiñ"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Stlennvonioù"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Programmadur"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Programmadur"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME ha KDE"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE ha Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kalonenn"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Aozerien"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Deskadurezh"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Kendarvanerezh"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Binvioù restr"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "C'hoarioù"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Troioù-kaer"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "C'hoarioù"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "C'hoarioù tavarn"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Kartennoù"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kartenn"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Mildammoù"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sportoù"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Kadouriezh"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Burev c'hrafek"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Burev c'hrafek"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafek"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Evezhiañ"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Liesvedia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Rouedad"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Flapañ"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Rouedad"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Treuzkas restroù"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Postelerezh a-benn-kaer "
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Mailh"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Keleier"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Diraez a-bell"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "Gwiad bedel"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Burev"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Alc'hwezioù foran"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Embann"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Skiantoù"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Steredoniezh"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Skiantoù"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Bioloji"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chimi"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Urzhiata<"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Jeoloji"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematikoù"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fisik"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shelloù"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Son"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Reizhad"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Sol"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Kefluniadur"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Reizhad"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Loc'hañ ha deraouekaat"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Kefluniadur"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Periantel"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Ober pakadoù"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "War voulañ"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr ""
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr ""
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Nodrezhoù"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Letrin"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Nodrezhoù"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Etrebroadeladur"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kalon ha perientel"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Levraouegoù"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servijerien"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Termenelloù"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Binvioù skrid"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "C'hoarielloù"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Hegerz ebet)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Disoc'hoù ar glask"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Disoc'hoù ar glask (hini ebet)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Gortozit mar plij, o klask ..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Harpañ"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Ouzhpennabl"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Bremanaet"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Ouzhpennabl"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Andiuzet"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Diuzet"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Andiuzet"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Talvoudegezh : "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr ""
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Deskrivadur ebet"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Restroù :\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Kemmoù :\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Medium : "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Stumm a zo stalied bremañ : "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Anv : "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Doare : "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Ment : "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s Ko"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Talvoudegezh : "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Ment : "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Diverrañ : "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr ""
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Deskrivadur : "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Deskrivadur ebet"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Titouroù muioc'h war ar pakad ..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Dibabit, mar plij"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Unan eus ar pakadoù a-heul a zo war-nes bezañ staliet :"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Dibabit, mar plij"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Gortozit mar plij, emaon o tiskouez ar pakadoù ..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "N'eus hini da vremanaat ebet"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means 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:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Holl"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Titouroù muioc'h"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Keleier war ar pakad"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Red eo da lemel un darn pakad"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Ne m'eus ket un darn pakad"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
-msgstr "Torret e vo ho reizhiad ma vefe lemet ar pakadoù-se, ho tigarez :\n\n"
+msgstr ""
+"Torret e vo ho reizhiad ma vefe lemet ar pakadoù-se, ho tigarez :\n"
+"\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Red eo da staliañ pakadoù ouzhpenn"
 
-#: ../rpmdrake:804
-#, fuzzy, c-format
+#: ../rpmdrake:860
+#, 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"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Ne m'eus ket gallet staliañ un darn pakad"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1378,123 +1168,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Red eo da lemel un darn pakad"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Diuzet : %d Mo / egor dieub ar bladenn : %d Mo"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Ment diuzet : %d Mo"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "N'eo ket da gaout deskrivadur ar pakad-mañ\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Bremanaat surentez"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr ""
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Staliañ"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Bremañaat reizh"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Ne stalianit ket"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s choazh"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Dibab Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "An holl bakadoù (gant anv)"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "An holl bakadoù (gant strollad)"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "An holl bakadoù (nevez pe bevaet)"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "An holl bakadoù (gant ment)"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "An holl bakadoù (dibabet pe n'eo ket dibabet)"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "An holl bakadoù (gant ar medium)"
+#: ../rpmdrake:1010
+msgid "Leaves only, sorted by install date"
+msgstr ""
 
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "An holl bakadoù (nevez pe bevaet)"
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "An holl bakadoù (gant strollad)"
 
-#: ../rpmdrake:982
-#, c-format
-msgid "Leaves only, sorted by install date"
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Bremañaat reizh"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Bremañaat reizh"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Bremanaat surentez"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "e anvioù"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "e deskrivadurioù"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "e anvioù restr"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Titouroù reoliek"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "An holl ditouroù"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Red eo deoc'h da zibab un darn pakad da gentañ."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Re a pakadoùet zo diuzet"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1505,7 +1280,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1514,89 +1289,100 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Restr"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Bremanaat ar medioù"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Goullonderiñ an dibab"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Adkargañ roll ar _pakadoù"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Kuitaat"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Dibarzhoù"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Skoazell"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Bremañaat Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Klask :"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Klask"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Skarañ"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Staliañ"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Kuitaat"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Fazi sac'hus"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Degouezhet ez eus ur fazi sac'hus : %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1604,13 +1390,12 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Bez eus ur vedia bremañaat c'hoazh"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1620,13 +1405,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1635,58 +1419,56 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Gortozit mar plij, o klask ar pakadoù hegerz ..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Gortozit mar plij, o lenn stlennvon ar pakadoù ..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Emaon o vurutellat %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "kemmoù :"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Lemel .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Implij .%s evel ar restr kentañ"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ober netra"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Echu eo ar staliadur"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Burutellat ..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Staliet gant berzh eo ar pakadoù dibabet."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Fazi en ar staliadur"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1696,18 +1478,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "N'em eus ket kaout ar pakadoù tarzh."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "N'em eus ket kaout ar pakadoù tarzh, ho tigarez, %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1719,38 +1500,34 @@ msgstr ""
 "Fazi(où) a oa kemennet :\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "O staliañ ar pakadoù ..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "O teraouiñ ..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "O staliañ ar pakadoù ..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Kemmañ ar media"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lakait ar vedia a zo graet « %s » anezhañ el lenner [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Emaon oc'h enkargañ ar pakad « %s » (%s/%s) ..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "O wiriekaat sinaduroù ar pakadoù ..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1764,13 +1541,12 @@ msgstr ""
 "\n"
 "Ha fellout a ra deoc'h da genderc'hel ar staliadur ?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Staliañ a zo sac'het"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1778,23 +1554,22 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "O prientiñ ar staliadur ..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "O staliañ ar pakad « %s » (%s/%s) ..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "n'hellan ket tizhout ar restr rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1805,43 +1580,34 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Titouroù muioc'h war ar pakad ... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Pakad kavet ebet da staliañ."
 
-#: ../rpmdrake:1736
-#, fuzzy, c-format
+#: ../rpmdrake:1833
+#, fuzzy
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Kudennoù ho staliadur"
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Gortozit mar plij, o lenn stlennvon ar pakadoù ..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Gortozit mar plij, o lemel pakadoù ..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Fazi en ar lemeladur"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1851,8 +1617,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1860,8 +1625,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, fuzzy, c-format
+#: ../rpmdrake:1910
+#, fuzzy, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1872,13 +1637,11 @@ msgstr ""
 "\n"
 " "
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Degemer d'an ostilh staliadur ar pakadoù !"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1887,214 +1650,172 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Bremanaat ar pakadoù"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Bremañaat Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Bremanaat ar pakadoù"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Anv an arveriad :"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Lemel pakadoù"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Bremanaat ar pakadoù"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Staliadur ar pakadoù poellad"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "N'eo ket"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ya"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Titouroù ..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Aostria"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australi"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Beljik"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Suis"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Republik Tchek"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Alamagn"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Gres"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spagn"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Gall"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hongri"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Itali"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japon"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Kore"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Izelvroioù"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvej"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Pologn"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusi"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Sued"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapour"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovaki"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taeihlwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Rouantelezh Unanet"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Sina"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Amerika"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2102,8 +1823,7 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2111,25 +1831,28 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s choazh"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Gortozit mar plij, emaon oc'h enkargañ chomelec'hoù ar melezourioù."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Gortozit mar plij, emaon oc'h enkargañ chomelec'hoù ar melezourioù evit al "
 "lec'hienn gwiad Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Fazi en un enkargañ"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2138,8 +1861,8 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2148,18 +1871,15 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "N'eo ket melezou"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "N'hell ket bet kavet ur melezour mat bennak."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2168,69 +1888,64 @@ msgid ""
 "by Mandriva Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Dibabit ar melezour c'hoantet."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Emaon oc'h eilañ ar restr evit ar medium « %s » ..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "O lenn restr ar vedium « %s » ..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "O lenn restr a-bell ar vedium « %s » ..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " graet."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr "sac'het!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s eur ar medium %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Oc'h enkargañ « %s », tizh : %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Gortozit mar plij, o bremanaat ar media ..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Fazi en un digas ar pakadoù"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2240,34 +1955,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Bremanaat ar media"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Dibabit ar media da vremanaat :"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Dibabit an holl re"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Bremañaat"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2275,8 +1985,8 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2286,18 +1996,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Ne m'eus ket gallet krouiñ ar medium."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Fazi en ur grouiñ ar medium"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2307,29 +2015,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2604,6 +2310,18 @@ msgstr "Lemel Poelladoù"
 msgid "Software Media Manager"
 msgstr "Merour ar pakadoù"
 
+#~ msgid "Stop"
+#~ msgstr "Harpañ"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "An holl bakadoù (gant ar medium)"
+
+#~ msgid "Normal information"
+#~ msgstr "Titouroù reoliek"
+
+#~ msgid "Maximum information"
+#~ msgstr "An holl ditouroù"
+
 #~ msgid "Update medium"
 #~ msgstr "Bremanaat ar medium"
 
@@ -2619,9 +2337,6 @@ msgstr "Merour ar pakadoù"
 #~ msgid "/_View"
 #~ msgstr "/_Gwel"
 
-#~ msgid "Don't install"
-#~ msgstr "Ne stalianit ket"
-
 #~ msgid "Package is corrupted"
 #~ msgstr " Pakadoù'zo brein"
 
diff --git a/po/bs.po b/po/bs.po
index 82fbaab4..f7a80c35 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-02-02 17:51+0100\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosanski <lokal@lugbih.org>\n"
@@ -14,13 +15,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Izaberite vrstu medija"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -45,18 +44,16 @@ msgstr ""
 "moraćete\n"
 "to raditi u dva koraka.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Izvori distribucije"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Zvanične nadogradnje"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -74,104 +71,86 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Molim sačekajte, dodajem medije..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Dodaj medij"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokalne datoteke"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Put:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "FTP server"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Izmjenjivi uređaj"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Put ili tačka montiranja:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Izmjenjivi uređaj"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Potraži..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativni put do synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Ako ostavite prazno, synthesis/hdlist će biti automatski otkriven"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Ime:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Napravi medij za čitavu distribuciju"
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Izaberite medije koje želite unaprijediti:"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Trebate popuniti najmanje prva dva polja."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -179,13 +158,11 @@ msgstr ""
 "Već postoji medij sa tim imenom, da li ga stvarno\n"
 "želite zamijeniti?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Dodajem medij:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tip medija:"
 
@@ -193,10 +170,9 @@ msgstr "Tip medija:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Odustani"
 
@@ -205,101 +181,86 @@ msgstr "Odustani"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "U redu"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Globalne opcije za instalaciju paketa"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "uvijek"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nikad"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Provjeri RPMove za instalaciju:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Download program:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Uklanjanje izvora"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Da li ste sigurni da želite obrisati izvor \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Molim sačekajte, brišem medij..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Promijeni medij"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Izmjena medija \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Snimi izmjene"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Morate ubaciti medij u uređaj za nastavak"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Ako želite spasiti izmjene, morate ubaciti medij u uređaj."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Konfiguriši proxije"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Postavke proxy-ja za medij \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globalne proxy postavke"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -308,166 +269,137 @@ msgstr ""
 "(sintaksa: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy ime računara:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Možete navesti korisničko ime / šifru za proxy identifikaciju."
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Korisnik:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Dodaj paralelnu grupu"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Izmijeni paralelnu grupu"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Dodajem limit medija"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Izaberite medij za dodavanje ograničenja medija:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Dodaj računar"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Unesite ime ili IP adresu računara kojeg želite dodati:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Izmjena paralelne grupe \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Ime grupe:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Ograničenje medija:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Dodaj"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Briši"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Računari:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Podesi paralelni urpmi (distribuirano izvršenje urpmi-ja)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grupa"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Ograničenje medija"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Naredba"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(nije instaliran)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Izmijeni..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Dodaj..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Upravljaj ključevima za digitalne potpise paketa"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Medij"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "ime nije pronađeno, ključ ne postoji u rpm keyringu!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Dodaj ključ"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Izaberite ključ za dodavanje na medij %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Ukloni ključ"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -476,37 +408,32 @@ msgstr ""
 "(ime ključa: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Dodaj ključ..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Ukloni ključ"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Podesi medije"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Uključeno?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Update"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -516,38 +443,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Dodaj vlastiti..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Unaprijedi..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Upravljaj ključevima..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralelno..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Globalne postavke..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -557,8 +478,7 @@ msgstr ""
 "\n"
 "Želite li da nastavim?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -572,8 +492,7 @@ msgstr ""
 "vašem računaru. Tada će oni biti dostupni kako biste mogli instalirati nove\n"
 "softverske pakete ili unaprjeđivati vaš sistem."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -584,13 +503,23 @@ msgstr ""
 "koji rade sa bazom paketa (imate li neki drugi menadžer medija\n"
 "na drugom desktopu ili trenutno instalirate neke druge pakete?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Ne mogu dodati medij, pogrešni ili nepostojeći argumenti"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Upravo ćete dodati novi medij za pakete, `%s'.\n"
+"Ovo znači da ćete moći dodati na vaš sistem nove pakete\n"
+"softvera sa tog medija."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -600,91 +529,85 @@ msgstr ""
 "Ovo znači da ćete moći dodati na vaš sistem nove pakete\n"
 "softvera sa tog medija."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Uspješno dodan medij `%s'."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Uspješno dodan medij `%s'."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, fuzzy, c-format
+#: ../rpmdrake:44
+#, fuzzy
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - osvježi samo medije za update.\n"
 
-#: ../rpmdrake:42
-#, fuzzy, c-format
+#: ../rpmdrake:45
+#, fuzzy
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - ispiši samo imena paketa.\n"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, fuzzy, c-format
+#: ../rpmdrake:49
+#, fuzzy
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                      DrakBackup Izvještaj o demonima\n"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Radim u korisničkom modu"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -694,634 +617,517 @@ msgstr ""
 "Nećete moći vršiti izmjene na sistemu, ali i dalje možete\n"
 "pregledati postojeću bazu podataka."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Pristupačnost"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arhiviranje"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD prženje"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Kompresija"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Ostalo"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Knjige"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Računarske knjige"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "FAQovi"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howto-ovi"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Književnost"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Prosljeđivanje poruka"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Queueing usluge"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikacije"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Baze podataka"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Programiranje"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Programiranje"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME i GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE i Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editori"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Obrazovanje"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Simulatori"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Alati za datoteke"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Igre"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Avanture"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Igre"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkadne igre"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Tabla"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Karte"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Zagonetke"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategija"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Grafički desktop"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Grafički desktop"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM baziran"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Nadzor"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedija"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Mreža"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Mreža"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Prijenos podataka"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Instant poruke"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "E-mail"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Udaljeni pristup"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ured"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Javni ključevi"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Izdavaštvo"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Nauke"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomija"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Nauke"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Hemija"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Računarske nauke"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geonauke"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Sistem"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Osnovno"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Podešavanje"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Sistem"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Pokretanje i inicijalizacija"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Podešavanje"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakiranje"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Štampanje"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Deploiement"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Deploiement"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fontovi"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konzola"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Fontovi"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitmapa"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalizacija"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel i hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Biblioteke"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Serveri"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Tekst alati"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Igračke"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Nijedan nije dostupan)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Rezultati pretrage"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Rezultati pretrage (ništa)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Molim sačekajte, tražim..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stani"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Može se dodati"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Može se unaprijediti"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Može se dodati"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Nije izabrano"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Izabrano"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Nije izabrano"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Značaj: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Razlog za update: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Bez opisa"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Datoteke:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Medij: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Trenutno instalirana verzija: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Verzija: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Veličina: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Značaj: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Veličina: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Sažetak: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Razlog za update: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Bez opisa"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Više informacija o paketu..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Molim izaberite"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Potreban je jedan od sljedećih paketa:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Molim izaberite"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Molim sačekajte, listam pakete..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Nema update-a"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1331,29 +1137,24 @@ msgstr ""
 "za pakete koji su instalirani na vašem računaru, ili da ste ih\n"
 "već instalirali."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Sve"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Više informacija"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informacije o paketima"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Potrebno je obrisati neke dodatne pakete"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1363,13 +1164,11 @@ msgstr ""
 "deinstalirati:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Neke pakete se ne može deinstalirati"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1377,8 +1176,7 @@ msgstr ""
 "Uklanjanje ovog paketa bi izazvalo rušenje sistema:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1388,13 +1186,11 @@ msgstr ""
 "izbaciti sa liste izabranih:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Potrebni su dodatni paketi"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1404,18 +1200,17 @@ msgstr ""
 "instalirati:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (pripada listi za preskakanje)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Neki paketi se ne mogu instalirati"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1425,123 +1220,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Neke pakete treba obrisati"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izabrano: %d MB / Slobodan prostor: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Veličina izabranog: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Opis nije dostupan za ovaj paket\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Sigurnosna unaprjeđenja"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Ispravke bugova"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instaliraj"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normalni update-i"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instaliraj"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s izbori"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux izbori"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Svi paketi, abecedno"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Svi paketi, po grupi"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Svi paketi, po dostupnosti update-a"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Svi paketi, po veličini"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Svi paketi, po stanju izabranosti"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Svi paketi, po spremištu medija"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Svi paketi, po dostupnosti update-a"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Samo listovi, sortirani po datumu instalacije"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Svi paketi, po grupi"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normalni update-i"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Ispravke bugova"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normalni update-i"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Sigurnosna unaprjeđenja"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "u imenima"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "u opisima"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "u imenima datoteka"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normalne informacije"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maksimalne informacije"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Trebate najprije izabrati neke pakete."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Izabrano je previše paketa"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1558,7 +1338,7 @@ msgstr ""
 "Želite li stvarno instalirati sve izabrane pakete?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1572,89 +1352,100 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Osvježi medije"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Poništi izbor"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Ponovo učitaj _listu paketa"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Izlaz"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/Op_cije"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Automatski prikaži izabrane pakete"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/Po_moć"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Update"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Pronađi:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Pretraga"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Očisti"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instaliraj"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Završi"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Fatalna greška"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Došlo je do fatalne greške: %s"
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1666,13 +1457,12 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Već postojeći update medij"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1687,13 +1477,12 @@ msgstr ""
 "\n"
 "Zatim, restartujte %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Kako da ručno izaberete vaš mirror"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1707,58 +1496,56 @@ msgstr ""
 "\n"
 "Onda restartujte %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Molim sačekajte, tražim dostupne pakete..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Molim sačekajte, čitam bazu paketa..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Ispitujem %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "izmjene:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Ukloni .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Koristi .%s kao glavnu datoteku"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Nemoj raditi ništa"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalacija završena"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Ispitaj..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Svi traženi paketi su uspješno instalirani."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problem prilikom instalacije"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1768,18 +1555,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Ne mogu da dobavim izvorne pakete."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ne mogu da dobavim izvorne pakete, žalim. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1790,38 +1576,34 @@ msgstr ""
 "\n"
 "Prijavljene greške:%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalacija paketa..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicijaliziram..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalacija paketa..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Promijeni medij"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim ubacite medij pod imenom \"%s\" u uređaj [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Downloadujem paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Provjeravam potpise paketa..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1835,13 +1617,12 @@ msgstr ""
 "\n"
 "Želite li nastaviti instalaciju?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1853,23 +1634,22 @@ msgstr ""
 "\n"
 "Vjerovatno trebate update-ovati vašu bazu medija."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Pripremam instalaciju paketa..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti RPM datoteci [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1882,43 +1662,33 @@ msgstr ""
 "rpmsave',\n"
 "sada ih možete ispitati kako biste preduzeli neke akcije:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Ovi paketi dolaze sa informacijama o unaprjeđenju"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Više informacija o paketu... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Paket za instalaciju nije pronađen."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Nepopravljiva greška: nije pronađen paket za instalaciju, žalim."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Molim sačekajte, čitam bazu paketa..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Molim sačekajte, uklanjam pakete..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problem prilikom uklanjanja"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1928,8 +1698,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1941,8 +1710,8 @@ msgstr ""
 "Ovaj alat će vam pomoći da izaberete koji softver želite ukloniti sa vašeg\n"
 "računara."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1954,13 +1723,11 @@ msgstr ""
 "Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
 "vaš računar."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Dobro došli u alat za instalaciju programa!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1974,214 +1741,174 @@ msgstr ""
 "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:101
-#, c-format
-msgid "Software Update"
-msgstr "Ažuriranje programa"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Update"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Ažuriranje programa"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Molim unesite vašu email adresu ispod"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Ime korisnika:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Uklanjanje softverskih paketa"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Ažuriranje softverskih paketa"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalacija softverskih paketa"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australija"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Švicarska"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Njemačka"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danska"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grčka"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Španija"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finska"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Francuska"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Mađarska"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italija"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovačka"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "SAD"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2193,8 +1920,7 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2206,23 +1932,26 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s izbori"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Molim sačekajte, skidam adrese mirrora."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Molim sačekajte, skidam adrese mirrora sa Mandriva web stranice."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Greška prilikom downloada"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2236,8 +1965,8 @@ msgstr ""
 "Mreža ili web stranica su možda nedostupni.\n"
 "Molim probajte ponovo kasnije."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2251,18 +1980,15 @@ msgstr ""
 "Mreža ili Mandriva web stranica su možda nedostupni.\n"
 "Molim probajte ponovo kasnije."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nema mirrora"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Ne mogu pronaći nijedan pogodan mirror."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2276,69 +2002,64 @@ msgstr ""
 "arhitektura vašeg procesora nije podržana od strane Mandriva Linux\n"
 "oficijelnih update-a."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Molimo izaberite željeni mirror"
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiram datoteku za medij '%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Ispitujem datoteku medija '%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ispitujem udaljenu datoteku medija '%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " završeno."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " nije uspjelo!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s sa medija %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Započinjem download '%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download '%s', preostalo:%s, brzina:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download '%s', brzina:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Molim sačekajte, osvježavam medije..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Greška pri dobavljanju paketa"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2353,34 +2074,29 @@ msgstr ""
 "biste ga rekonfigurisali; ili je medij trenutno nedostupan i trebate\n"
 "pokušati ponovo kasnije."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Osvježi medij"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Izaberite medije koje želite unaprijediti:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Izaberi sve"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Update"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2392,8 +2108,8 @@ msgstr ""
 "Greške:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2403,18 +2119,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Ne mogu kreirati medij."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Neuspjeh u dodavanju medija"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2424,8 +2138,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2435,8 +2149,8 @@ msgstr ""
 "(%s).\n"
 "Medij će biti isključen."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2446,13 +2160,11 @@ msgstr ""
 "trenutno koristite (%s).\n"
 "Medij će biti isključen."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Pomoć je pokrenuta u pozadini"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2728,6 +2440,18 @@ msgstr "Ukloni softver"
 msgid "Software Media Manager"
 msgstr "Upravitelj medijima softvera"
 
+#~ msgid "Stop"
+#~ msgstr "Stani"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Svi paketi, po spremištu medija"
+
+#~ msgid "Normal information"
+#~ msgstr "Normalne informacije"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maksimalne informacije"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "sve je uspješno instalirano"
 
diff --git a/po/ca.po b/po/ca.po
index 1e2d5aa5..eab30ab6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ca\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-11-09 00:32+0000\n"
 "Last-Translator: Ticià Sala <tsala@pie.xtec.es>\n"
 "Language-Team:  <ca@li.org>\n"
@@ -19,13 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Escolliu el tipus de font"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -49,18 +48,16 @@ msgstr ""
 "però\n"
 "ho haureu de fer en dos passos.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Fonts de la distribució"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Actualitzacions oficials"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -79,104 +76,85 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Si us plau espereu, s'estan afegint fonts..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Afegeix una font"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Fitxers locals"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Camí:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "Servidor FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Servidor HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Dispositiu extraïble"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Camí o punt de muntatge:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Dispositiu extraïble"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Navega..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Entrada:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Camí relatiu a synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Si es deixa en blanc, synthesis/hdlist serà buscat automàticament "
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nom:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Crea suport per a una distribució completa"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Cerca actualitzacions en aquesta font"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Es necessita que ompliu les dues primeres entrades."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -184,13 +162,11 @@ msgstr ""
 "Ja hi ha una font amb aquest nom, realment\n"
 "voleu reemplaçar-la?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Afegint una font:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tipus de font:"
 
@@ -198,10 +174,9 @@ msgstr "Tipus de font:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -210,101 +185,86 @@ msgstr "Cancel·la"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "D'acord"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Opcions globals per a la instal·lació de paquets"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "sempre"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "mai"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifica els RPMs a instal·lar:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Programa de descàrrega a usar:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Eliminació de fonts"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Esteu segur de voler eliminar la font \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Si us plau espereu, s'està eliminant la font..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Edita una font"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Editant la font \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Desa canvis"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Intermediari..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Heu d'inserir la font per a continuar"
 
 #: ../edit-urpm-sources.pl:434
-#, 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 la font en la unitat."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Configureu els servidors intermediaris"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Configuració de l'intermediari per a la font \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Opcions globals de l'intermediari"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -313,169 +273,140 @@ msgstr ""
 "servidor i un port opcional (sintaxi: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Nom del servidor intermediari:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Podeu especificar un usuari/contrasenya en la autenticació del servidor "
 "intermediari:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Usuari:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Afegeix un grup paral·lel"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Edita un grup paral·lel "
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Afegeix un límit de font"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Escolliu una font per afegir-la al límit de fonts:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Afegeix un ordinador"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 "Escriviu el nom de l'ordinador o la direcció IP de l'ordinador a afegir:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editant el grup paral·lel \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nom del grup:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Límit de font:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Afegeix"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Suprimeix"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Ordinadors Centrals:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configura l'urpmi paral·lel (execució distribuïda de urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grup"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Límit de fonts"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Ordre"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(cap)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Edita..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Afegeix..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Administra les claus per a les signatures digitals dels paquets"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Font"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Claus"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "No s'ha trobat cap nom, la clau no existeix a l'anell de claus de rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Afegeix una clau"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Seleccioni una clau per afegir a la font %s "
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Elimina una clau"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -484,39 +415,33 @@ msgstr ""
 "(nom de la clau: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Afegeix una clau..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Suprimeix la clau"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Configura les fonts "
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Habilitat?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Actualitzacions?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Aquesta font necessita ser actualitzada per ser utilitzable. L'actualitzo "
 "ara?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -526,38 +451,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Afegeix personalitzat..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Actualització..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Administra les claus..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paral·lel..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Opcions globals..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -567,8 +486,7 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -584,8 +502,7 @@ msgstr ""
 "programari \n"
 "o que es facin actualitzacions del sistema."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -597,13 +514,23 @@ msgstr ""
 "de paquets (teniu un altre gestor de paquets o esteu instal·lant\n"
 "algun paquet?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "No s'ha pogut afegir la font, arguments incorrectes o insuficients"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Esteu a punt d'afegir una nova font de paquets, `%s'.\n"
+"Això vol dir que podreu afegir paquets de programari\n"
+"al vostre sistema des d'aquesta font."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -613,18 +540,22 @@ msgstr ""
 "Això vol dir que podreu afegir paquets de programari\n"
 "al vostre sistema des d'aquesta font."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "S'ha afegit la font `%s' amb èxit."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "S'ha afegit la font `%s' amb èxit."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Sintaxi: %s [OPCIÓ]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -632,43 +563,36 @@ msgstr ""
 "  --changelog-first      mostra el registre de canvis abans de la llista "
 "d'arxius en la finestra de descripció"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     es limita a la font triada"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     proposa combinar tots els .rpmnew/.rpmsave trobats"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            estableix el mode (install (instal·lar (per "
 "defecte)), remove (eliminar), update (actualitzar))"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      no demanis confirmació en mode actualització"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      no actualitzis les fonts al principi"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        no verifiquis les signatures dels paquets"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -676,33 +600,27 @@ msgstr ""
 "  --parallel=alias,host  estar en mode paral·lel, usa \"alias\" grup, usa la "
 "màquina \"host\" per mostrar les dependències"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    mostra només aquets paquets"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      preselecciona aquests paquets"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 força l'execució com a root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           inicia recerca de \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Funcionant en mode usuari"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -712,634 +630,517 @@ msgstr ""
 "No serà permès fer modificacions al sistema,\n"
 "però podrà examinar la base de dades existent."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Accessibilitat"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arxivant"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Resguard"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Creació de Cds"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compressió"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Altres"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Llibres"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Llibres d'informàtica "
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Preguntes més freqüents"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Com es fa...?"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Pas de missatges"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Serveis de cues"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Comunicacions"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Bases de dades"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Desenvolupament"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Desenvolupament"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "Gnome i GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE i QT"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Nucli"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editors"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Educació"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emuladors"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Eines de fitxer"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Jocs"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Aventura"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Jocs"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Taulers"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cartes"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Trencaclosques"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Esports"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Estratègia"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Escriptori gràfic"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Escriptori gràfic"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Basat en FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Gràfics"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitorització"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimèdia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Xarxa"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Xat"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Xarxa"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transferència de fitxers "
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Missatgeria instantània"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Correu electrònic "
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Notícies"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Accés remot"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ofimàtica"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Claus públiques"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publicació"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Ciències"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Ciències"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Química"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Ciències de la computació"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geociències"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matemàtiques"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Física"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Intèrprets d'ordres"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "So"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Sistema"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Configuració"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Sistema"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Arrencada i Inici"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configuració"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Maquinari "
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Empaquetat"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Imprimint"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Desplegament"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Desplegament"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fonts"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Consola"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Fonts"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Mapa de bits X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalització"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Nucli i maquinari"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Biblioteques"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servidors"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminals"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Eines de text"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Joguines"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(No disponible)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Resultats de la cerca"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Resultats de la cerca (cap)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Si us plau espereu, s'està buscant..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Para"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Afegible"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Actualitzable"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Afegible"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "No seleccionat"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Seleccionat"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "No seleccionat"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importància: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Raó d'actualització: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Cap descripció"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fitxers:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Canvis:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Font:"
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versió actualment instal·lada: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nom: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versió: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arquitectura: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Mida: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Importància: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Mida: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Resum: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Raó d'actualització: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Descripció: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Cap descripció"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Més informació del paquet..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Si us plau escolliu"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Es necessita un dels següents paquets:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Si us plau escolliu"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Si us plau espereu, llistant els paquets..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "No hi ha actualitzacions"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1350,29 +1151,24 @@ msgstr ""
 "ordinador,\n"
 "o que ja els heu instal·lat tots."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Tot"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Més informació"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informació dels paquets"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Cal esborrar alguns paquets addicionals"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1382,13 +1178,11 @@ msgstr ""
 "ser esborrats:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Alguns paquets no poden ser esborrats"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1396,8 +1190,7 @@ msgstr ""
 "Suprimir aquests paquets faria mal bé el sistema, disculpau:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1407,13 +1200,11 @@ msgstr ""
 "deseleccionar:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Es necessiten paquets addicionals"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1423,18 +1214,17 @@ msgstr ""
 "paquet(s):\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (pertany a la llista d'omesos)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Alguns paquets no poder ser instal·lats"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1444,123 +1234,108 @@ msgstr ""
 "\n"
 "%s "
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "S'han d'eliminar alguns paquets"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seleccionats: %d MB / Espai lliure en el disc: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Espai seleccionat %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "La descripció d'aquest paquet no està disponible\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Actualitzacions de seguretat"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Actualitzacions que reparen errors"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instal·la"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Actualitzacions normals"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instal·la"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "Seleccions de %s"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Seleccions de Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Tots els paquets, alfabèticament"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Tots els paquets, per grup"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Tots els paquets, amb actualització."
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Tots els paquets, per tamany"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Tots els paquets, per estat de selecció"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Tots els paquets, per dipòsit de fonts"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Tots els paquets, amb actualització."
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Ordenat per data de instal·lació."
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Tots els paquets, per grup"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Actualitzacions normals"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Actualitzacions que reparen errors"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Actualitzacions normals"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Actualitzacions de seguretat"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "en noms"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "en descripcions "
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "en noms de fitxers"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informació normal"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Informació màxima"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Primer necessiteu escollir alguns paquets."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "S'han seleccionat massa paquets"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1577,7 +1352,7 @@ msgstr ""
 "Realment voleu instal·lar els paquets seleccionats?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1591,89 +1366,100 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Fitxer"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Actualitza les fonts"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Esborra la selecció"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Recarrega la llista de paquets"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Surt"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Opcions"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Mostra automàticament els paquets seleccionats"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Actualització de Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Troba:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Cerca"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Neteja"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instal·la"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Surt"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Hi ha hagut un error fatal %s. "
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1685,13 +1471,12 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Ja existeix la font d'actualització"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1707,13 +1492,12 @@ msgstr ""
 "\n"
 "Després reinicieu la %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Com escollir manualment la rèplica"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1727,58 +1511,56 @@ msgstr ""
 "\n"
 "Aleshores, reinicieu %s. "
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Espereu mentre es cerquen els paquets disponibles... "
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Si us plau, espereu, s'està llegint la base de dades de paquets..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Inspeccionant %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "canvis:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Elimina .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Utilitzar .%s com a fitxer principal"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "No facis res"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instal·lació finalitzada"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "S'està inspeccionant..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Tots els paquets demanats s'han instal·lat correctament."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Hi ha hagut problemes durant la instal·lació "
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1788,18 +1570,17 @@ msgstr ""
 "\n"
 "%s "
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "No és possible aconseguir els paquets de fonts."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "No és possible aconseguir els paquets de fonts, ho sento. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1811,38 +1592,34 @@ msgstr ""
 "Error(s) reportats:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instal·lació dels paquets..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "S'està inicialitzant..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instal·lació dels paquets..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Canvieu la font"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Per favor, inseriu la font anomenada \"%s\" en el dispositiu [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "S'està descarregant el paquet '%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Verificant les firmes dels paquets"
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1856,13 +1633,12 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar amb la instal·lació?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instal·lació fallida"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1874,23 +1650,22 @@ msgstr ""
 "\n"
 "Hauríeu d'actualitzar la base de dades de les teves fonts."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "S'estan preparant els paquets per a la instal·lació... "
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "S'està instal·lant el paquet '%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1903,45 +1678,35 @@ msgstr ""
 "rpmsave',\n"
 "ara podeu inspeccionar-los per a emprendre accions:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Aquests paquets venen amb informació d'actualització"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Més informació del paquet... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "No s'ha trobat cap paquet per instal·lar"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Error irrecuperable. No s'han trobat els paquets necessaris per a la "
 "instalació. "
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Si us plau, espereu, s'està llegint la base de dades de paquets..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Si us plau, espereu, s'estan esborrant els paquets..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Hi ha hagut un problema durant la desinstal·lació"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1951,8 +1716,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1964,8 +1728,8 @@ msgstr ""
 "Aquesta eina us ajudarà a escollir quin programari voleu eliminar del\n"
 "vostre ordinador."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1977,13 +1741,11 @@ msgstr ""
 "Aquesta eina us ajudarà a escollir les actualitzacions que voleu instal·lar\n"
 "en el vostre.ordinador."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Benvinguts a l'eina d'instal·lació de programari!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1998,215 +1760,173 @@ msgstr ""
 "programari\n"
 "voleu instal·lar en el vostre ordinador."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Actualització de Programari"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Actualització de Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Actualització de Programari"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 "Si us plau, entreu les vostres dades per accedir al servidor intermediari\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Nom d'usuari:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Eliminació de Paquets de Programari"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Actualització de Paquets de Programari"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instal·lació de Paquets de Programari"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Sí"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informació..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Àustria"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Austràlia"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Bèlgica"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canadà"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Suïssa"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "República Txeca"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Alemanya"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grècia"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Espanya"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlàndia"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "França"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hongria"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel "
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Itàlia"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japó"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Països Baixos"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polònia"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rússia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Suècia"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Eslovàquia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Regne Unit"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Xina"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Estats Units"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2218,8 +1938,7 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2232,25 +1951,28 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "Seleccions de %s"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Si us plau, espereu, s'estan baixant les adreces de les rèpliques."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Si us plau, espereu, baixant les adreces de les rèpliques des de la web de "
 "Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "S'ha produït un error durant la descàrrega"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2264,8 +1986,8 @@ msgstr ""
 "La xarxa, o la web, deuen ser inaccessibles.\n"
 "Si us plau, proveu-ho més tard."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2279,18 +2001,15 @@ msgstr ""
 "La xarxa, o la web de Mandriva, deuen ser inaccessibles.\n"
 "Si us plau, proveu-ho més tard."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Sense rèplica"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "No s'ha pogut trobar cap rèplica adequada."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2304,69 +2023,64 @@ msgstr ""
 "quan l'arquitectura del seu processador no és suportada \n"
 "per Mandriva Linux Official Updates."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Si us plau, seleccioneu la rèplica desitjada."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copiant fitxer per a la font `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinant el fitxer de fonts `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinant el fitxer remot de fonts `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " fet."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " error!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s de la font %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Començant la baixada de `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Descàrrega de `%s', temps per a finalitzar:%s, velocitat:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Baixada de `%s', velocitat: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Si us plau espereu, actualitzant dades..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Error recuperant els paquets"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2383,36 +2097,31 @@ msgstr ""
 "de\n"
 "tornar-ho a intentar més tard."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Actualitza la(es) font(s)"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "No s'ha trobat una font activa. Haurieu d'activar alguna font per poder-la "
 "actualitzar."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Seleccioneu la(es) font(s) que voleu actualitzar:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Selecciona-ho tot"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Actualitza"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2424,8 +2133,8 @@ msgstr ""
 "Errors:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2435,18 +2144,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "No es pot crear la font."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Fallada al afegir una font"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2456,8 +2163,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2467,8 +2174,8 @@ msgstr ""
 "esteu usant (%s).\n"
 "Es deshabilitarà."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2478,13 +2185,11 @@ msgstr ""
 "Linux que esteu usant (%s).\n"
 "Es deshabilitarà."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Ajuda executada en segon pla."
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2761,5 +2466,17 @@ msgstr "Elimina programari"
 msgid "Software Media Manager"
 msgstr "Gestor de Fonts de Programari"
 
+#~ msgid "Stop"
+#~ msgstr "Para"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Tots els paquets, per dipòsit de fonts"
+
+#~ msgid "Normal information"
+#~ msgstr "Informació normal"
+
+#~ msgid "Maximum information"
+#~ msgstr "Informació màxima"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "tot s'ha instal·lat correctament"
diff --git a/po/cs.po b/po/cs.po
index 93edb41a..04fb6de3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-08-06 13:56+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -23,13 +24,11 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Zvolte typ zdroje"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -51,18 +50,16 @@ msgstr ""
 "které obsahují oficiální aktualizace vaší distribuce. (Můžete přidat oba\n"
 "druhy zdrojů, ale budete to muset udělat ve dvou krocích.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Zdroje distribuce"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Oficiální aktualizace"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -80,104 +77,85 @@ msgstr ""
 "\n"
 "Mohu pokračovat?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Prosím počkejte, přidávám zdroje..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Přidat zdroj"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokální soubory"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Cesta:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "FTP server"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Vyjímatelné zařízení"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Cesta nebo přípojný bod:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Vyjímatelné zařízení"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Procházet..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Přihlášení:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativní cesta pro soubor hdlist nebo syntézu:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Pokud ponecháte prázdné, bude se automaticky zkoušet synthesis/hdlist"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Jméno:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Vytvořit zdroje pro celou distribuci"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Hledat aktualizace v tomto zdroji"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Musíte vyplnit alespoň první dvě políčka."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -185,13 +163,11 @@ msgstr ""
 "Takto pojmenovaný zdroj již existuje, chcete\n"
 "jej opravdu nahradit?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Přidávám zdroj:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Typ zdroje:"
 
@@ -199,10 +175,9 @@ msgstr "Typ zdroje:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -211,101 +186,86 @@ msgstr "Zrušit"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Ok"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Globální volby pro instalaci balíčků"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "vždy"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nikdy"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Zkontrolujte balíčky, které se mají instalovat:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Program použitý ke stahování:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Odstranění zdroje"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Opravdu chcete odstranit zdroj \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Prosím počkejte, odstraňuji zdroj..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Upravit zdroj"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Upravuji zdroj \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Uložit změny"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Chcete-li pokračovat, musíte vložit médium"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Chcete-li uložit změny, musíte do zařízení vložit médium."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Nastavit proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Nastavení proxy zdroje \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globální nastavení proxy"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -314,166 +274,137 @@ msgstr ""
 "<proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Název počítače proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, 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:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Uživatel:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Přidat paralelní skupinu"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Upravit paralelní skupinu"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Přidat omezení zdroje"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Vyberte zdroj k přidání do omezení zdrojů:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Přidat počítač"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Zadejte název nebo IP adresu počítače, který se má přidat:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Upravuji paralelní skupinu \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Název skupiny:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Omezení zdroje:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Přidat"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Odstranit"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Počítače:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Nastavit paralelní urpmi (distribuované spouštění urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Skupina"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Omezení zdrojů"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Příkaz"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(žádná)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Upravit..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Přidat..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Správa klíčů pro digitální podpisy balíčků"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Zdroj"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Klíče"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "název nenalezen, klíč není na seznamu!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Přidá klíč"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Vyberte klíč pro zdroj %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Odebrat klíč"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -482,37 +413,31 @@ msgstr ""
 "(název klíče je: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Přidat klíč..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Odstranit klíč"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Nastavit zdroje"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Povolen?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Aktualizace?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -522,38 +447,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Přidat vlastní..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Aktualizovat..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Správa klíčů..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralelní..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Globální nastavení..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -563,8 +482,7 @@ msgstr ""
 "\n"
 "Mohu pokračovat?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -578,8 +496,7 @@ msgstr ""
 "počítači používat. Tyto zdroje budou k dispozici při instalaci nových\n"
 "balíčků software nebo při jejich aktualizaci."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -591,13 +508,23 @@ msgstr ""
 "zdrojů software na jiné ploše, nebo je možné, že právě také\n"
 "instalujete balíčky.)"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Nelze přidat zdroj, chybné nebo chybějící parametry"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Chystáte se přidat nový zdroj s balíčky, %s.\n"
+"To znamená, že budete moci do vašeho systému instalovat nové\n"
+"balíčky se software z tohoto zdroje."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -607,18 +534,22 @@ msgstr ""
 "To znamená, že budete moci do vašeho systému instalovat nové\n"
 "balíčky se software z tohoto zdroje."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Zdroj `%s' byl úspěšně přidán."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Zdroj `%s' byl úspěšně přidán."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Použití: %s [VOLBY]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -626,45 +557,38 @@ msgstr ""
 "  --changelog-first      zobrazí v okně s popisem změnové záznamy před "
 "seznamem souborů"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     omezí se na zadané zdroje"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     navrhne sloučit všechny nalezené soubory .rpmnew/."
 "rpmsave"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            nastaví režim (install (výchozí), remove, update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      nebude se ptát na první potvrzení v režimu "
 "aktualizace"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      nebude aktualizovat zdroje při spuštění"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        nebude kontrolovat podpisy balíčků"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -672,33 +596,27 @@ msgstr ""
 "  --parallel=alias,host  přepne se do paralelního režimu, použije skupinu "
 "\"alias\", použije počítač \"host\" pro zobrazení potřebných závislostí"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    zobrazí pouze tyto balíčky"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      předvybere tyto balíčky"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 vynutí si spuštění pod uživatelem root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           spustí vyhledávání balíčku \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Běh v uživatelském režimu"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -708,634 +626,517 @@ msgstr ""
 "Nebudete moci provádět úpravy vašeho systému,\n"
 "můžete však prohlížet vaši stávající databázi."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Zpřístupnění"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archivování"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Zálohování"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Vypalování CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Komprimace"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Jiné"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Knihy"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Počítačová literatura"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Často kladené otázky"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Návody"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Předávání zpráv"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Služby frontování"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikace"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Databáze"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Vývoj"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Vývoj"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME a GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE a Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Jádro"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editory"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Vzdělávání"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulátory"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Souborové nástroje"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Hry"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Dobrodružné"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Hry"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkády"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Stolní hry"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Karty"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Hlavolamy"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sporty"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategie"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Grafické prostředí"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Grafické prostředí"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Založené na FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "IceWM"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Sledování"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimédia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Sítě"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Sítě"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Přenos souboru"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Okamžitá výměna zpráv"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Diskusní skupiny"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Vzdálený přístup"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Kancelář"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Veřejné klíče"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publikování"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Vědy"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomie"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Vědy"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chemie"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Počítačová věda"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geovědy"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fyzika"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shelly"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Systém"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Základ"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Nastavení"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Systém"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Zavádění a inicializace"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Nastavení"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Balíčky"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Tisk"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Nasazení"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Nasazení"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Písma"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konzole"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Písma"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Bitmapa X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalizace"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Jádro a hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Knihovny"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servery"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminály"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Textové nástroje"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Hračky"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Není k dispozici)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Výsledky hledání"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Výsledky hledání (žádné)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Prosím počkejte, hledám..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stop"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Lze přidat"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Lze aktualizovat"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Lze přidat"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Nevybrán"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Vybraný"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Nevybrán"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Důležitost: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Důvod pro aktualizaci: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Žádný popis"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Soubory:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Změny:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Zdroj: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Nyní nainstalovaná verze: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Název: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Verze: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Architektura: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Velikost: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s kB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Důležitost: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Velikost: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Shrnutí: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Důvod pro aktualizaci: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Popis: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Žádný popis"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Více informací o balíčku..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Prosím vyberte"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Je třeba jeden z následujících balíčků:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Prosím vyberte"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Prosím počkejte, vypisuji balíčky..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Žádná aktualizace"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1345,29 +1146,24 @@ msgstr ""
 "žádné aktualizace pro balíčky instalované na vašem počítači, nebo už\n"
 "máte všechny aktualizace nainstalované."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Vše"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Více informací"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informace o balíčcích"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Je třeba odstranit některé další balíčky"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1377,13 +1173,11 @@ msgstr ""
 "balíčky:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Některé balíčky nelze odstranit"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1391,8 +1185,7 @@ msgstr ""
 "Odstranění těchto balíčků by poškodilo váš systém, omlouváme se:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1402,13 +1195,11 @@ msgstr ""
 "balíčků:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Jsou potřeba další balíčky"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1418,18 +1209,17 @@ msgstr ""
 "balíčky:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (patří do přeskakovaných)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Některé balíčky nelze nainstalovat"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1439,123 +1229,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Některé balíčky musí být odebrány"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Vybráno: %d MB / Volné místo na disku: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Velikost výběru: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Popis tohoto balíčku není k dispozici\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Bezpečnostní aktualizace"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Opravy chyb"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instalovat"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Běžné aktualizace"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instalovat"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "Volby %s"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Volby Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Všechny balíčky, abecedně"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Všechny balíčky, podle skupiny"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Všechny balíčky, podle dostupnosti aktualizace"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Všechny balíčky, podle velikosti"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Všechny balíčky, podle stavu výběru"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Všechny balíčky, podle umístění zdroje"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Všechny balíčky, podle dostupnosti aktualizace"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Pouze listy, tříděné podle data instalace"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Všechny balíčky, podle skupiny"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Běžné aktualizace"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Opravy chyb"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Běžné aktualizace"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Bezpečnostní aktualizace"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "v názvech"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "v popisech"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "v názvech souborů"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Běžné informace"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Všechny informace"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Musíte nejprve vybrat nějaké balíčky."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Je vybráno příliš mnoho balíčků"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1572,7 +1347,7 @@ msgstr ""
 "Opravdu chcete nainstalovat všechny vybrané balíčky?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1586,89 +1361,100 @@ msgstr ""
 "\n"
 "Mohu pokračovat?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/Akt_ualizovat zdroje"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/Nulovat výbě_r"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Znovu načíst seznam _balíčků"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Konec"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/V_olby"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Ukázat auto_maticky vybrané balíčky"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Update"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Najít:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Hledat"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instalovat"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Konec"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Fatální chyba"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Vyskytla se fatální chyba: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1680,13 +1466,12 @@ msgstr ""
 "\n"
 "Mohu pokračovat?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Již existující zdroj pro aktualizaci"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1701,13 +1486,12 @@ msgstr ""
 "\n"
 "Poté znovu spusťte %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Jak ručně vybrat vaše zrcadlo"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1721,58 +1505,56 @@ msgstr ""
 "\n"
 "Poté znovu spusťte aplikaci %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Prosím počkejte, hledám dostupné balíčky..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Prosím počkejte, načítám databázi balíčků..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Prohlížím %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "změny:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Odebrat .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Použít .%s jako hlavní soubor"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Nedělat nic"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalace dokončena"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Prozkoumat..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Všechny požadované balíčky byly úspěšně nainstalovány."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Při instalaci nastaly problémy"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1782,18 +1564,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Nelze získat balíčky se zdroji."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Nelze získat zdrojové balíčky, promiňte. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1805,38 +1586,34 @@ msgstr ""
 "Nahlášené chyby:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalace balíčku..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicializuji..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalace balíčku..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Změnit zdroj"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vložte prosím médium nazvané \"%s\" do zařízení [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Stahuji balíček '%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Kontrolují se podpisy balíčků..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1850,13 +1627,12 @@ msgstr ""
 "\n"
 "Chcete pokračovat v instalaci?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalace selhala"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1868,23 +1644,22 @@ msgstr ""
 "\n"
 "Možná by se měla aktualizovat vaše databáze zdrojů."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Připravuji instalaci balíčků..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaluji balíček '%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "nelze zpřístupnit rpm soubor [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1896,43 +1671,33 @@ msgstr ""
 "Některé soubory s nastavením byly vytvořeny s příponou `.rpmnew' nebo\n"
 "`.rpmsave'. Některé z nich můžete nyní prozkoumat a rozhodnout, co s nimi:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Tyto balíčky obsahují informace o aktualizaci"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Více informací o balíčku... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "K instalaci nebyly nalezeny žádné balíčky."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Fatální chyba: nebyly nalezeny žádné balíčky k instalaci, promiňte."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosím počkejte, načítám databázi balíčků..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Prosím počkejte, odebírám balíčky..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problém při odebírání"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1942,8 +1707,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1955,8 +1719,8 @@ msgstr ""
 "Tento nástroj vám pomůže vybrat, které balíčky chcete odstranit ze svého\n"
 "počítače."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1968,13 +1732,11 @@ msgstr ""
 "Tento nástroj vám pomůže vybrat aktualizace, které chcete instalovat na\n"
 "vašem počítači."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Vítejte v nástroji pro instalaci software!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1989,214 +1751,172 @@ msgstr ""
 "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:101
-#, c-format
-msgid "Software Update"
-msgstr "Aktualizace software"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Update"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Aktualizace software"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Zadejte prosím své přístupové informace k proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Uživatelské jméno:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Odstranění balíčků software"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Aktualizace balíčků software"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalace balíčků software"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ano"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informace..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Rakousko"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Austrálie"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgie"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazílie"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Švýcarsko"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Česká republika"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Německo"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Dánsko"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Řecko"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Španělsko"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finsko"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Francie"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Maďarsko"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Itálie"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japonsko"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Nizozemí"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norsko"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polsko"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugalsko"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusko"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovensko"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Velká Británie"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Čína"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Spojené státy"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2208,8 +1928,7 @@ msgstr ""
 "\n"
 "Mohu pokračovat?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2221,24 +1940,27 @@ msgstr ""
 "\n"
 "Mohu pokračovat?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "Volby %s"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Prosím počkejte, stahuji adresy zrcadel."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Prosím počkejte, stahuji adresy zrcadel ze stránek společnosti Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Chyba při stahování"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2252,8 +1974,8 @@ msgstr ""
 "Je možné, že síť nebo webové stránky nejsou k dispozici.\n"
 "Zkuste to prosím později."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2267,18 +1989,15 @@ msgstr ""
 "Je možné, že síť nebo stránky společnosti Mandriva nejsou k dispozici.\n"
 "Zkuste to prosím později."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Není zrcadlo"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Nelze nalézt žádné vhodné zrcadlo."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2292,69 +2011,64 @@ msgstr ""
 "kdy architektura vašeho procesoru není podporovaná službou\n"
 "oficiálních aktualizací distribuce Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Vyberte prosím vhodné zrcadlo."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopíruje se soubor pro zdroj '%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Zkoumá se soubor zdroje '%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Zkoumá se vzdálený soubor zdroje '%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " hotovo."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " selhalo!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s ze zdroje %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Začíná se stahovat '%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Stahování '%s', zbývající čas: %s, rychlost: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Stahování '%s', rychlost: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Prosím počkejte, aktualizuji zdroje..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Chyba při získávání balíčků"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2370,34 +2084,29 @@ msgstr ""
 "instalační zdroj dostupný a měli byste to zkusit\n"
 "později."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Aktualizovat zdroje"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Vyberte zdroje, které si přejete aktualizovat:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Vybrat vše"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2409,8 +2118,8 @@ msgstr ""
 "Chyby:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2420,18 +2129,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Nelze vytvořit zdroj."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Selhání při pokusu o přidání zdroje"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2441,8 +2148,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2452,8 +2159,8 @@ msgstr ""
 "distribuce %s, která právě běží (%s).\n"
 "Tento zdroj bude vypnut."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2463,13 +2170,11 @@ msgstr ""
 "Mandriva Linuxu, která právě běží (%s).\n"
 "Tento zdroj bude vypnut."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Nápověda spuštěna v pozadí"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2745,6 +2450,18 @@ msgstr "Odebrat software"
 msgid "Software Media Manager"
 msgstr "Správce zdrojů software"
 
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Všechny balíčky, podle umístění zdroje"
+
+#~ msgid "Normal information"
+#~ msgstr "Běžné informace"
+
+#~ msgid "Maximum information"
+#~ msgstr "Všechny informace"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "vše bylo úspěšně nainstalováno"
 
diff --git a/po/cy.po b/po/cy.po
index ff908ba8..947f2e3c 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2006-03-08 19:36-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -17,13 +18,11 @@ msgstr ""
 "X-Poedit-Language: Welsh\n"
 "X-Poedit-Country: UK\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Dewis y math o gyfrwng"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -48,18 +47,16 @@ msgstr ""
 "gwneud\n"
 "hyn mewn dau gam)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Ffynonellau dosbarthu"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Diweddariadau swyddogol"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -77,104 +74,84 @@ msgstr ""
 "\n"
 "Parhau?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Ychwanegu cyfrwng"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Ffeiliau lleol"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Llwybr:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "Gweinydd RSYNC"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Gweinydd HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Dyfais symudol"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Llwybr neu bwynt gosod:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Dyfais symudol"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Pori..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Llwybr perthynol i synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Os yn wag bydd synthesis/hdlistyn cael ei holi'n awtomatic"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Enw:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Creu cyfrwng ar gyfer dosbarthiad cyfan"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Chwilio'rcyfrwng am ddiweddariadau"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Mae angen llanw y ddau gofnod cyntaf, o leiaf."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -182,13 +159,11 @@ msgstr ""
 "Mae yna gyfrwng o'r enw yna eisoes, hoffech chi\n"
 "ei amnewid?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Ychwanegu cyfrwng:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Math o gyfrwng:"
 
@@ -196,10 +171,9 @@ msgstr "Math o gyfrwng:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Diddymu"
 
@@ -208,101 +182,86 @@ msgstr "Diddymu"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Iawn"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Dewisiadau eang ar gyfer gosod pecynnau"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "bob tro"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "byth"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Gwirio RPMau i'w gosod:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Llwytho rhaglen i lawr i'w defnyddio:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Tynnu Ffynhonnell"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ydych chi'n siŵr eich bod eisiau tynnu ffynhonnell \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Arhoswch, tynnu cyfrwng..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Golygu'r cyfrwng"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Cadw newidiadau"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Dirprwy..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Er mwyn cadw'r newidiadau, rhaid gosod y cyfrwng yn y gyrrwr."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Ffurfweddu'r dirprwyon"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Gosodiadau dirprwy ar gyfer cyfrwng \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Gosodiadau dirprwy eang"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -311,139 +270,113 @@ msgstr ""
 "(cystrawen: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Enw gwesteiwr y dirprwy:"
 
 #: ../edit-urpm-sources.pl:474
-#, 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:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Defnyddiwr:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Ychwanegu grŵp paralel"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Golygu grŵp paralel"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Ychwanegu terfyn cyfrwng"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Dewiswch gyfrwng i ychwanegu at derfyn y cyfrwng:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Ychwanegu gwesteiwr:"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Teipiwch enw gwesteiwr neu IP y gwestai i'w ychwanegu:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Golygu grŵp paralel\"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Enw grŵp:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Terfyn cyfrwng:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Tynnu"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Gwesteion:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ffurfweddu urpmi paralel (dosbarthiad gweithredol o urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grŵp"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Terfyn cyfrwng"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Gorchymyn"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(dim)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Golygu..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Ychwanegu..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Rheoli allweddi pecynnau digidol "
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Cyfrwng"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -452,27 +385,24 @@ msgstr ""
 "Allweddi"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "heb ganfod enw, nid yw'r allwedd yn bodoli yng nghylch allwedd rpm"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Ychwanegu allwedd"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Dewis bysell ti ychwanegu at gyfrwng %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Tynnu allwedd"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -481,37 +411,31 @@ msgstr ""
 "(enw'r allwedd: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Ychwanegu allwedd..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Tynnu allwedd"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Ffurfweddu'r cyfrwng"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Galluogwyd?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Diweddariadau?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Mae angen diweddaru'r cyfrwng i fod yn ddefnyddiol. Diweddaru?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -521,38 +445,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Ychwanegu addasiad..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Diweddau..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Rheoli allweddi"
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Dewisiadau eang..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -562,8 +480,7 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -577,8 +494,7 @@ msgstr ""
 "rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
 "pecynnau newydd neu er mwyn diweddaru."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -590,13 +506,23 @@ msgstr ""
 "arall ar fwrdd gwaith arall, neu a ydych yn gosod pecynnau\n"
 " eraill hefyd?"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Rydych ar fin gosod cyfrwng pecynnau newydd, %s'.\n"
+"Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
+"newydd i'ch system o'r cyfrwng hwnnw."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -606,18 +532,22 @@ msgstr ""
 "Mae hyn yn golygu y bydd modd gosod pecynnau meddalwedd\n"
 "newydd i'ch system o'r cyfrwng hwnnw."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Defnyddi: %s [DEWIS]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -625,42 +555,35 @@ msgstr ""
 "  --changelog-first      dangos cofnod newid cyn filelist yn y ffenestr "
 "disgrifio"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     terfyn i'r cyfrwng hwn"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     cynnig uno pob ffeil  .rpmnew/.rpmsave"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            gosod modd (gosod (rhagosodedig), tynnu, diweddaru)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      peidio gofyn cwestiwn cadarnhau ym modd diweddaru"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update    peidio diweddaru cyfrwng wrth gychwyn"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        peidio gwirio llofnod pecynnau"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -668,33 +591,27 @@ msgstr ""
 "  --parallel=alias,host  ym modd paralel, defnyddio grŵp \"alias\" , "
 "defnyddio peiriant  \"host\" i ddangos deps angenrheidiol"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    dangos y pecynnau yma'n unig"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      rhag ddewis y pecynnau yma"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 gorfodi ei redeg fel root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           chwilio am \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Rhedeg ym modd defnyddiwr"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -704,634 +621,517 @@ msgstr ""
 "Ni fydd modd i chi greu newidiadau i'r system.\n"
 "ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Hygyrchedd"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archifo"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Wrth Gefn"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Llosgi CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Cywasgiad"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Arall"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Llyfrau"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Llyfrau cyfrifiadurol"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Cwestiynau poblogaidd"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Llenyddiaeth"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Clwstwr"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Pasio Negeseuon"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Gwasanaethau Ciwio"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Cyfathrebu"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Cronfeydd Data"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Datblygiad"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Datblygiad"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME a GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE a Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Cnewyllyn"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Golygyddion"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Addysg"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Efelychwyr"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Offer ffeilio"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Gemau"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Antur"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Gemau"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcêd"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Byrddau"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cardiau"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Posau"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Chwaraeon"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategaeth"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Bwrdd gwaith graffigol"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Bwrdd gwaith graffigol"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM seiliedig"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Graffigau"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitro"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Amlgyfrwng"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Rhwydweithio"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Sgwrs"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Rhwydweithio"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Trosglwyddo ffeiliau"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Negesu Chwim"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "E-bost"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Newyddion"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Mynediad pell"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Swyddfa"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Allweddi Cyhoeddus"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Cyhoeddi"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Gwyddorau"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astroleg"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Gwyddorau"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Bywydeg"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Cemeg"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Gwyddor Cyfrifiadureg"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Gwyddorau Daear"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Mathemateg"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Ffiseg"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Cregyn"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Sain"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "System"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Sail"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Ffurfweddu"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "System"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Cychwyn ac Ymgychwyn"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Ffurfweddu"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pecynnu"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Argraffu"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Defnyddio"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Defnyddio"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Ffontiau"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Consol"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Ffontiau"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Math 1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Didfap X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Rhyngwladoli"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Cnewyllyn a chaledwedd."
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Llyfrgelloedd"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Gweinyddion"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terfynellau"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Offer testun"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Teganau"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Fideo"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Atal"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Ychwanegadwy"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Ychwanegadwy"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Heb ei ddewis"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Heb ei ddewis"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Dim disgrifiad"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Cyfrwng:"
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Enw: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Pensaernïaeth:"
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Maint: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Pwysigrwydd: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Maint: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Crynodeb: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Dim disgrifiad"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Rhagor o wybodaeth ar becyn..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Dewiswch"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Dewiswch"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1341,29 +1141,24 @@ msgstr ""
 "nad oes diweddariad ar gyfer y pecynnau ar eich cyfrifiadur,\n"
 "neu rydych wedi eu gosod i gyd yn barod."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Popeth"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Rhagor"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Gwybodaeth am becynnau"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1373,13 +1168,11 @@ msgstr ""
 "hefyd: \n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1387,8 +1180,7 @@ msgstr ""
 "Bydd tynnu'r pecynnau hyn yn torri eich system, sori\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1397,13 +1189,11 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1413,18 +1203,17 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (perthyn i'r rhestr hepgor)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1434,123 +1223,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewiswyd: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Dim disgrifiad ar gael i'r pecyn hwn\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Diweddariadau diogelwch"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Diweddariad cywiro gwallau"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Gosod"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Diweddariadau arferol"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Gosod"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s dewis"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Dewisiadau Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Pob pecyn, yn ôl grŵp"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Pob pecyn, yn ôl diweddariad"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Pob pecyn, yn ôl maint"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Pob pecyn, yn ôl dyddiad dewis"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Pob pecyn, yn ôl diweddariad"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Gadael, yn ôl dyddiad gosod"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Pob pecyn, yn ôl grŵp"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Diweddariadau arferol"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Diweddariad cywiro gwallau"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Diweddariadau arferol"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Diweddariadau diogelwch"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "enwau"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "disgrifiadau"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "mewn enwau ffeil"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Gwybodaeth arferol"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Gwybodaeth lawn"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Rhaid dewis rhai pecynnau'n gyntaf."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1561,7 +1335,7 @@ msgid ""
 msgstr "Rhybudd:"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1575,89 +1349,100 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Diweddaru'r cyfrwng"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Ailosod y dewis"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Ail-lwytho'r rhestr pecynnau"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Dangoswch y pecynnau dewis awtomatig"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Diweddaru Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Clirio"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Gosod"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Digwyddodd gwall terfynol:%s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1669,13 +1454,12 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Cyfrwng diweddaru sy'n bod eisoes"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1691,13 +1475,12 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1711,58 +1494,56 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Archwilio %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "newidiadau:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Gorffennodd y gosodiad"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1772,18 +1553,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1795,38 +1575,34 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Gosod pecynnau..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Gosod pecynnau..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1840,13 +1616,12 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau gyda'r gosod?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1858,23 +1633,21 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad at ffeil rpm (%s)"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1886,43 +1659,33 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Rhagor o wybodaeth ar becyn... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Heb ganfod pecyn i'w osod"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Arhoswch, darllen cronfa ddata'r pecynnau..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1932,8 +1695,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1945,8 +1707,8 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1957,13 +1719,11 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Croeso i'r offeryn gosod meddalwedd!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1977,214 +1737,172 @@ msgstr ""
 "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:101
-#, c-format
-msgid "Software Update"
-msgstr "Diweddaru Meddalwedd"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Diweddaru Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Diweddaru Meddalwedd"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Rhowch eich hawl i gael mynediad dirprwy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Diweddaru Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Gosod Pecynnau Meddalwedd"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Na"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Iawn"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Gwybodaeth..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Awstria"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Awstralia"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Y Swistir"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Groeg"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Sbaen"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Ffindir"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Ffrainc"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Siapan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norwy"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rwsia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Tsiena"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2196,8 +1914,7 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2209,23 +1926,26 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s dewis"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Arhoswch, llwytho i lawr cyfeiriadau drychau o safle gwe Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2239,8 +1959,8 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu'r safle, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2254,18 +1974,15 @@ msgstr ""
 "Nid yw'r rhwydwaith, neu safle Mandriva, ar gael.\n"
 "Ceisiwch eto."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Dim drych"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Methu canfod drych addas."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2279,69 +1996,64 @@ msgstr ""
 "yw pensaernïaeth eich prosesydd yn cael ei gynnal gan Diweddariadau\n"
 "Swyddogol Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copïo ffeil fel ar gyfer cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Archwilio ffeil cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Archwilio ffeil bell y cyfrwng '%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " methwyd!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s o gyfrwng %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Cychwyn llwytho %s i lawr..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Llwytho '%s' i lawr, cyflymdra:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Gwall estyn pecynnau"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2357,34 +2069,29 @@ msgstr ""
 "neu nid oes modd ei gyrraedd ar hyn o bryd a dylech geisio eto \n"
 "rhywbryd."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Diweddaru'r cyfrwng"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "Heb ganfod cyfrwng byw. Rhaid galluogi cyfrwng i'w diweddaru."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Dewiswch y cyfrwng i'w diweddaru:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Dewis popeth"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Diweddaru"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2396,8 +2103,8 @@ msgstr ""
 "Gwallau:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2407,18 +2114,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Methu ychwanegu cyfrwng"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2428,8 +2133,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2439,8 +2144,8 @@ msgstr ""
 "s rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2450,13 +2155,11 @@ msgstr ""
 "Mandriva Linux rydych yn ei redeg (%s).\n"
 "Bydd yn cael ei anablu."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Cymorth wedi ei gychwyn yn y cefndir"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2733,6 +2436,18 @@ msgstr "Tynnu Meddalwedd"
 msgid "Software Media Manager"
 msgstr "Rheolwr Cyfrwng Meddalwedd"
 
+#~ msgid "Stop"
+#~ msgstr "Atal"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Pob pecyn, yn ôl yn ôl ffynhonnell eu storfa"
+
+#~ msgid "Normal information"
+#~ msgstr "Gwybodaeth arferol"
+
+#~ msgid "Maximum information"
+#~ msgstr "Gwybodaeth lawn"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "gosodwyd popeth yn llwyddiannus"
 
diff --git a/po/da.po b/po/da.po
index d5e6b460..841d29df 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2006-02-18 22:39+0100\n"
 "Last-Translator: Keld Simonsen <keld@rap.dk>\n"
 "Language-Team:  <da@li.org>\n"
@@ -23,13 +24,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Vælg medietype"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -54,18 +53,16 @@ msgstr ""
 "skal så\n"
 "gøre dette i to trin.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Kilder for distribution"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Officielle opdateringer"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -83,104 +80,84 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Vent venligst, tilføjer medie..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Tilføj et medie"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Sti:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "RSYNC-server"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP-server"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Udskiftelig enhed"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "sti eller monteringspunkt:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Udskiftelig enhed"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Gennemse..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativ sti til syntese eller hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Hvis ladt være, vil synthesis/hdlist automatisk blive søgt efter"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Navn:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Opret et medie for en hel distribution"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Gennemsøg dette medie for opdateringer"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Du skal udfylde i det mindste de to første indgange."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -188,13 +165,11 @@ msgstr ""
 "Der er allerede et medie med dette navn, ønsker du\n"
 "virkelig at erstatte dette?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Tilføjer et medie:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Medietype:"
 
@@ -202,10 +177,9 @@ msgstr "Medietype:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Annullér"
 
@@ -214,101 +188,86 @@ msgstr "Annullér"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "O.k."
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Generelle valgmuligheder for installation af pakker"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "altid"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "aldrig"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Efterprøv RPM'er som skal installeres"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Hent program der skal bruges:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Fjernelse af kilde"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Er du sikker på at du vil fjerne kilden '%s'?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Vent venligst, fjerner medie..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Redigér et medie"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Redigerer medie '%s':"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Gem ændringer"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Du skal indsætte mediet for at fortsætte"
 
 #: ../edit-urpm-sources.pl:434
-#, 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."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Konfigurér proxyer"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxy-opsætning for medie '%s'"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Global proxy-opsætning"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -317,167 +276,138 @@ msgstr ""
 "port (syntaks: <proxyvært[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Værtsnavn for proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, 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:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Bruger:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Tilføj en parallel gruppe"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Redigér en parallel gruppe"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Tilføj en mediegrænse"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Vælg et medie at tilføje i mediebegrænsningen"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Tilføj en vært"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Indtast værtsnavnet eller ip-adressen der skal tilføjes:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redigerer parallel gruppe '%s':"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Mediegrænse:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Tilføj"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Fjern"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Værter:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfigurér parallel urpmi (distribueret udførelse af urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Medie-begrænsking"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Kommando"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Redigér..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Tilføj..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Administrér nøgler for digitale underskrifter på pakker"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Medie"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Nøgler"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "intet navn fundet, nøgle eksisterer ikke i rpm-nøglering!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Tilføj en nøgle"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Vælg en nøgle at tilføje i mediet %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Fjern en nøgle"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -486,37 +416,31 @@ msgstr ""
 "(navn på nøglen: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Tilføj en nøgle..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Fjern nøgle"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Konfigurér medier"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Aktiveret?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Opdateringer?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Mediet skal opdateres for at være brugeligt. Skal det opdateres nu?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -526,38 +450,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Tilføj tilpasset..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Opdatér..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Administrér nøgler..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parallel..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Generelle valgmuligheder..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -567,8 +485,7 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -583,8 +500,7 @@ msgstr ""
 "på maskinen. De vil derefter være tilgængelige så du kan installere nye\n"
 "programmer eller udføre opdateringer."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -596,13 +512,23 @@ msgstr ""
 "på en anden maskine, eller er du også i øjeblikket i færd med at installere\n"
 "pakker?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Kunne ikke tilføje medie, forkert eller manglende argumenter"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Du er ved at tilføje et nyt pakkemedie, '%s'.\n"
+"Dette betyder at du vil kunne tilføje nye programpakker\n"
+"til dit system fra dette nye medie."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -612,62 +538,59 @@ msgstr ""
 "Dette betyder at du vil kunne tilføje nye programpakker\n"
 "til dit system fra dette nye medie."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Tilføjelse af medie '%s' gennemført."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Tilføjelse af medie '%s' gennemført."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Brug: %s [VALGMULIGHEDER]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 "  --changelog-first      vis ændringslog før filliste i beskrivelsesvinduet"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     begræns til angivet medie"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     foreslå at flette alle .rpmnew/.rpmsave-filer fundet"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            sæt tilstand (install (standard), remove, update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      spørg ikke det første bekræftelsesspørgsmål i "
 "opdateringssilstand"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      opdatér ikke medie ved opstart"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        efterprøv ikke pakkeunderskrifter"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -675,33 +598,27 @@ msgstr ""
 "  --parallel=alias,host  vær i parallel-tilstand, brug \"alias\" gruppe, "
 "brug \"host\" maskine til at vise krævede afhængigheder"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    vis kun disse pakker"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      vælg disse pakker på forhånd"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 gennemtving kørsel som root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           kør søgning for \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Kører i brugertilstand"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -711,634 +628,517 @@ msgstr ""
 "Du vil ikke kunne udføre ændringer på systemet,\n"
 "men du vil alligevel kunne kigge på den eksisterende database."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Tilgængelighed"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arkivering"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Sikkerhedskopi"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Cd-brænding"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Andet"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Bøger"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Edb-bøger"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "OSS"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Opskrifter"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Litteratur"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Klynge"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Beskedsoverføring"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Køtjenester"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Kommunikation"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Databaser"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Udvikling"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Udvikling"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME og GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE og Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kerne"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Redigering"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Uddannelse"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatorer"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Filværktøjer"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Spil"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Æventyr"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Spil"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Bræt"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kort"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Gåder"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategi"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Grafisk skrivebord"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Grafisk skrivebord"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM baseret"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Overvåger"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedie"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Netværk"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Netværk"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Filoverførsel"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Øjeblikkelig besked"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Post"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Nyheder"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Fjernadgang"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Kontor"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Offentlige nøgler"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publicering"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Naturvidenskab"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomi"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Naturvidenskab"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kemi"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Datalogi"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geologi"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematik"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fysik"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Skaller"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "System"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfigurering"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "System"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Opstart og initialisering"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigurering"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Udstyr"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakning"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Udskrift"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Udnyttelse"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Udnyttelse"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsol"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Skrifttyper"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internationalisering"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kerne og udstyr"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Biblioteker"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servere"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminaler"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Tekstværktøjer"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Legetøj"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Ingen tilgængelig)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Søgeresultater"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Søgeresultater (ingen)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Vent venligst, søger..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stop"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Kan tilføjes"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Kan opdateres"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Kan tilføjes"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Ikke valgt"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Valgt"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Ikke valgt"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Vigtighed: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Årsag til opdatering: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Ingen beskrivelse"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Filer:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Ændringslog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Medie: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Nuværende installeret version: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Version: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arkitektur: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Størrelse: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Vigtighed: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Størrelse: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Resumé: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Årsag til opdatering: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Ingen beskrivelse"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Mere information om pakken..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Vælg"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "En af følgende pakker behøves:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Vælg"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Vent venligst, lister pakker..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Ingen opdatering"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1348,29 +1148,24 @@ msgstr ""
 "findes nogen tilgængelige opdateringer for programmerne installeret\n"
 "på maskinen eller at du allerede har installeret dem alle."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Alt"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Mere info"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Information om pakker"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Nogle yderligere pakker skal fjernes"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1379,13 +1174,11 @@ msgstr ""
 "På grund af deres afhængigheder vil disse pakker også blive fjernet:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Visse pakker kan ikke fjernes"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1393,8 +1186,7 @@ msgstr ""
 "Desværre, fjernelse af disse pakker ville ødelægge systemet:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1404,13 +1196,11 @@ msgstr ""
 "afmarkeres nu:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Yderligere pakker behøves"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1419,18 +1209,17 @@ msgstr ""
 "For at opfylde afhængigheder skal følgende pakker også installeres:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (tilhører overspringningslisten)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Visse pakker kan ikke installeres"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1440,123 +1229,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Visse pakker skal fjernes"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valgt: %d MB / Fri diskplads: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Valgt størrelse: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Beskrivelse ikke tilgængelig for denne pakke\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Sikkerhedsopdateringer"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Fejlretningsopdateringer"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Installér"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normale opdateringer"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Installér"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s valg"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-valg"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Alle pakker, efter gruppe"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Alle pakker, efter opdateringstilgængelighed"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Alle pakker, efter størrelse"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Alle pakker, efter valgstatus"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Alle pakker, efter medielagringsplads"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Alle pakker, efter opdateringstilgængelighed"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Kun blade, sorteret efter installeringsdato"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Alle pakker, efter gruppe"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normale opdateringer"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Fejlretningsopdateringer"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normale opdateringer"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Sikkerhedsopdateringer"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "i navne"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "i beskrivelser"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "i filnavne"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normal information"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Mest information"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Du skal vælge nogen pakker først."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "For mange pakker er valgt"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1572,7 +1346,7 @@ msgstr ""
 "Ønsker du virkeligt at installere alle de valgte pakker?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1586,89 +1360,100 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Filer"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Opdatér medier"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Nulstil det valgte"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Genindlæs _pakkelisten"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Afslut"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Valgmuligheder"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Vis automatisk valgte pakker"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Opdatér"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Find:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Søg"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Nulstil"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installér"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "fatal fejl"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "En fatal fejl skete: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1680,13 +1465,12 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Allerede eksisterende opdateringsmedier"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1702,13 +1486,12 @@ msgstr ""
 "\n"
 "Derefter skal %s genstartes."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Hvordan du manuelt vælger dit spejl"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1722,58 +1505,56 @@ msgstr ""
 "\n"
 "Derefter skal %s genstartes."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Vent venligst, finder tilgængelige pakker..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Vent venligst, læser pakkedatabase..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Undersøger %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "ændringer:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Fjern .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Brug .%s som hovedfil"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Gør ingenting"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Installationen færdig"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Undersøg..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Alle ønskede pakker blev installeret uden problemer."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problem ved installationen"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1783,18 +1564,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Kunne ikke hente kildepakker."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Desværre, kunne ikke hente kildepakker. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1806,38 +1586,34 @@ msgstr ""
 "Fejl rapporteret:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Installation af pakker"
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Initialiserer..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Installation af pakker"
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Skift media"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Indsæt venligst mediet med navnet \"%s\" i enhed [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Henter pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Efterprøver pakkeunderskrifter..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1851,13 +1627,12 @@ msgstr ""
 "\n"
 "Ønsker du at fortsætte installeringen?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Installationen mislykkedes"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1869,23 +1644,21 @@ msgstr ""
 "\n"
 "Du skal måske opdatere din mediedatabase."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Forbereder installation af pakker"
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "kunne ikke få adgang til rpm-fil [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1897,43 +1670,33 @@ msgstr ""
 "Nogen konfigurationsfiler blev oprettet som '.rpmnew' eller '.rpmsave',\n"
 "du kan nu kigge på nogen for at tage aktion:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Disse pakker har opgraderings-information"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Mere information om pakken...[%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Ingen pakke fundet til installation."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Alvorlig fejl: ingen pakke fundet til installation. Beklager."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Vent venligst, læser pakkedatabase..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Vent venligst, fjerner pakker..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problem ved fjernelse"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1943,8 +1706,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1956,8 +1718,8 @@ msgstr ""
 "Dette værktøj hjælper dig med at vælge hvilke programmer du vil fjerne fra\n"
 "maskinen."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1969,13 +1731,11 @@ msgstr ""
 "Dette værktøj hjælper dig med at vælge opdateringerne du vil\n"
 "installere på maskinen."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Velkommen til værktøjet for programinstallering!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1990,214 +1750,172 @@ msgstr ""
 "programmer\n"
 "du vil installere på maskinen."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Opdatering af programmel"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Opdatér"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Opdatering af programmel"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Indtast dine adgangsoplysninger for adgang til proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Brugernavn:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Fjernelse af programpakker"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Opdatering af programpakker"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Installation af programpakker"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nej"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Østrig"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australien"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Tjekkiet"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grækenland"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Frankrig"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italien"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norge"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polen"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakiet"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "U.S.A."
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2209,8 +1927,7 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2222,23 +1939,26 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s valg"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Vent venligst, henter adresser på spejle."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Vent venligst, henter spejladresser fra Mandrivas websted."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Fejl under hentning"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2252,8 +1972,8 @@ msgstr ""
 "Netværket eller webstedet kan være utilgængeliget.\n"
 "Forsøg igen senere."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2267,18 +1987,15 @@ msgstr ""
 "Netværket eller Mandrivas websted kan være utilgængelige.\n"
 "Forsøg igen senere."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Intet spejl"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Jeg kan ikke finde et passende spejl."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2292,69 +2009,64 @@ msgstr ""
 "når arkitekturen på din processor ikke understøttes af\n"
 "Mandriva Linux' officielle opdateringer."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Vælg ønsket spejl."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierer fil for medie `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Undersøger fil fra medie '%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Undersøger ekstern fil for medie '%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " færdig."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " mislykkedes!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s fra medie %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Starter hentning af `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Hentning af `%s', resterende tid:%s, hastighed:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Hentning af `%s', hastighed:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Vent venligst, opdaterer medie..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Fejl ved hentning af pakker"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2369,36 +2081,31 @@ msgstr ""
 "det igen for at omkonfigurere det - eller også er det utilgængeligt i \n"
 "øjeblikket, og du bør da prøve igen senere."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Opdatér medier"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Intet aktivt medie blev fundet. Du skal aktivere nogen medier for at kunne "
 "opdatere dem."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Venligst vælg det medie du ønsker at opdatere:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Vælg alt"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Opdatér"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2410,8 +2117,8 @@ msgstr ""
 "Fejl:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2421,18 +2128,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Kan ikke lave medie."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Fejl ved tilføjelse af medie"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2442,8 +2147,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2453,8 +2158,8 @@ msgstr ""
 "kører (%s).\n"
 "Det vil blive deaktiveret."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2464,13 +2169,11 @@ msgstr ""
 "Linux som du kører (%s).\n"
 "Den vil blive deaktiveret."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Hjælp startes i baggrunden"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2745,3 +2448,15 @@ msgstr "Fjern programmel"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Administration af programmelmedier"
+
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Alle pakker, efter medielagringsplads"
+
+#~ msgid "Normal information"
+#~ msgstr "Normal information"
+
+#~ msgid "Maximum information"
+#~ msgstr "Mest information"
diff --git a/po/de.po b/po/de.po
index 67971421..1ceb1057 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-de\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-12-18 10:51+0100\n"
 "Last-Translator: Frank Koester <frank@dueppel13.de>\n"
 "Language-Team: deutsch\n"
@@ -23,13 +24,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Die Art des Mediums wählen"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -55,18 +54,16 @@ msgstr ""
 "hinzufügen, aber\n"
 "Sie müssen dieses in zwei Schritten erledigen)."
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Distributionsquellen"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Offizielle Aktualisierungen"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -84,104 +81,84 @@ msgstr ""
 "\n"
 "Ist es OK fortzufahren?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Bitte warten, füge Medien hinzu ..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Medium hinzufügen"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokale Dateien"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Pfad:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP-Server"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "RSYNC-Server"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP-Server"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Wechselmedium"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Pfad oder Einhängepunkt:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Wechselmedium"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Durchsuchen ..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Benutzername:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativer Pfad zur Synthesis- oder hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Falls leer, wird synthesis/hdlist automatisch probiert"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Name:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Erzeuge Medien für eine vollständige Distribution"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Dieses Medium nach Aktualisierungen durchsuchen"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Sie müssen zumindest die ersten beiden Felder ausfüllen."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -189,13 +166,11 @@ msgstr ""
 "Es existiert bereits ein Medium mit diesem Namen,\n"
 "wollen Sie es ersetzen?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Füge ein Medium hinzu:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Typ des Mediums:"
 
@@ -203,10 +178,9 @@ msgstr "Typ des Mediums:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -215,102 +189,87 @@ msgstr "Abbrechen"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "OK"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Globale Optionen für eine Paketinstallation"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "immer"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "niemals"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifiziere zu installierende RPMs:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Zu benutzendes Downloadprogramm:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Quelle entfernen"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Sind Sie sicher, dass Sie die Quelle „%s“ entfernen wollen?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Entferne das Medium, bitte warten ..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Medium bearbeiten"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Quelle „%s“ bearbeiten:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Proxy ..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Sie müssen das Medium einlegen, um fortfahren zu können"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 "Um die Änderungen zu speichern, müssen Sie das Medium ins Laufwerk legen."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Proxy einrichten"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxy-Einstellungen für Medium „%s“"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globale Proxy-Einstellungen"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -319,172 +278,143 @@ msgstr ""
 "- falls nötig auch den Port - an (Syntax: <Proxyrechner[:Port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxyname:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Sie können auch einen Benutzernamen und Passwort für die "
 "Proxyauthentifizierung angeben:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Benutzer:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Parallelgruppe hinzufügen"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Parallelgruppe bearbeiten"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Mediumbeschränkung hinzufügen"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Bitte wählen Sie ein Medium zum Hinzufügen in die Medienliste:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Computer hinzufügen"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 "Bitte geben Sie den Hostnamen oder die IP Adresse des \n"
 "Hosts an, den Sie hinzufügen möchten:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Bearbeite Parallelgruppe „%s“:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Gruppenname:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Medienbeschränkung:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Hinzufügen"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Entfernen"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Computer:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Paralleles urpmi einrichten (verteilte Ausführung von urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Medienbeschränkung"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokoll"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Befehl"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(keine)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Hinzufügen ..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Schlüssel für digitale Signaturen von Paketen verwalten"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Medium"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Schlüssel"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 "kein Name gefunden, der Schlüssel existiert im RPM\n"
 "Schlüssel-Ring nicht!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Schlüssel hinzufügen"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Wählen Sie einen Schlüssel, für das Medium %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Schlüssel entfernen"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -494,39 +424,33 @@ msgstr ""
 "(Name des Schlüssels: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Schlüssel hinzufügen ..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Schlüssel entfernen"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Medien konfigurieren"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Aktiviert?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Aktualisierungen?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Dieses Medium muss aktualisiert werden, damit es benutzbar ist. Jetzt "
 "aktualisieren?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -536,38 +460,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Füge angepaßte hinzu..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Aktualisiere ..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Schlüssel verwalten..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parallel..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Globale Optionen..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -577,8 +495,7 @@ msgstr ""
 "\n"
 "Wollen Sie fortfahren?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -592,8 +509,7 @@ msgstr ""
 "Ihren Rechner verwenden wollen. Sie stehen dann zur Verfügung, um\n"
 "Softwarepakete von dort zu installieren bzw. zu aktualisieren."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -604,13 +520,23 @@ msgstr ""
 "mit der Paketdatenbank arbeiten (haben Sie einen anderen Paket-Manager auf "
 "einem anderen Desktop laufen oder fügen Sie gerade Pakete hinzu?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Konnte das Medium nicht hinzufügen, falsche oder fehlende Argumente"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Sie sind dabei, ein neues Paket-Medium '%s' einzurichten,\n"
+"Das bedeutet, dass Sie in der Lage sind, neue Software-Pakete\n"
+"von diesem Medium auf Ihr System installieren können."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -620,18 +546,22 @@ msgstr ""
 "Das bedeutet, dass Sie in der Lage sind, neue Software-Pakete\n"
 "von diesem Medium auf Ihr System installieren können."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Medium '%s' erfolgreich hinzugefügt."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Medium '%s' erfolgreich hinzugefügt."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Verwendung: %s [OPTION]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -639,47 +569,40 @@ msgstr ""
 "  --changelog-first      changelog vor der  Dateiliste im "
 "Beschreibungsfenster darstellen"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     anzugebende Medien begrenzen"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     vorschlagen, alle gefundenen .rpmnew/.rpmsave "
 "Dateien zu vereinen"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            setze Modus (Installation (Vorgabe), Entfernen, "
 "Aktualisierung)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      keine Erstbestätigung im Aktualisierungsmodus "
 "abfragen"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 "  --no-media-update      die Medien nicht bei Inbetriebnahme aktualisieren"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        die Paketsignaturen nicht überprüfen"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -687,33 +610,27 @@ msgstr ""
 "  --parallel=alias,host  sind im parallelen Modus, benutze „alias“ Gruppe, "
 "benutze „host“ Rechner zum Anzeigen benötigter Abhängigkeiten"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    nur diese Pakete anzeigen"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      diese Pakete vorauswählen"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 das Ausführen als root erzwingen"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           Suche nach „pkg“ ausführen"
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Arbeite im Benutzer-Modus"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -723,634 +640,517 @@ msgstr ""
 "Sie können zwar keine Änderungen am System vornehmen,\n"
 "sich jedoch den Stand der Datenbank anschauen."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Eingabehilfen"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archivierung"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Sicherung"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD brennen"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Kompression"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Sonstige"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Bücher"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Computerbücher"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "FAQs"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "HOWTOs"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatur"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Nachricht passiert"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Dienste für Warteschlangen"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Kommunikationen"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Datenbanken"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Entwicklung"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Entwicklung"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME und GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE und Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editoren"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Bildung"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatoren"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Dateiwerkzeuge"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Spiele"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Abenteuer"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Spiele"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Brettspiele"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Karten"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzzles"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategie"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Grafische Oberfläche"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Aufklärung"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Grafische Oberfläche"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM-basiert"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "ICEWM"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Überwachung"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Netzwerk"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Chatten"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Netzwerk"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Dateitransfer"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Instant Messaging"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "E-Mail"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Nachrichten"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Entfernter Zugriff"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Büro"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Öffentliche Schlüssel"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Veröffentlichen"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Wissenschaften"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomie"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Wissenschaften"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chemie"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Computerwissenschaften"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geowissenschaften"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Mathematik"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Physik"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Klang"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "System"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Basis"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfiguration"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "System"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Startvorgang und Initialisierung"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Packen"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Drucken"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Entwicklung"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Entwicklung"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Schriftarten"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsole"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Schriftarten"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Typ 1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 Bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internationalisierung"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel und Hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Bibliotheken"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Server"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminals"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Textwerkzeuge"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Spielzeug"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Nicht vorhanden)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Suchergebnisse"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Suchergebnisse (keine)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Bitte warten, ich suche ..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "RpmDrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stopp"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Verfügbar"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Aktualisierbar"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Verfügbar"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Nicht markiert"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Markiert"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Nicht markiert"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Wichtigkeit: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Aktualisierungsgründe: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Keine Beschreibung"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Dateien:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "ChangeLog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Medium: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Momentan installierte Version: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Name: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Version: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Architektur: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Größe: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Wichtigkeit: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Größe: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Zusammenfassung: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Aktualisierungsgründe: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Keine Beschreibung"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "RpmDrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Mehr Paketinformationen ..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Bitte wählen Sie"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Sie benötigen eines der folgenden Pakete:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Bitte wählen Sie"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Auflisten der Pakete, bitte warten ..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Keine Aktualisierung"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1360,29 +1160,24 @@ msgstr ""
 "(noch) keine Aktualisierungen für Ihr System gibt oder dass Sie\n"
 "bereits alle Aktualisierungen auf Ihren Rechner aufgespielt haben."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Alle"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Mehr Infos"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Paketinformationen"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Einige weitere Pakete müssen ebenfalls entfernt werden"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1392,13 +1187,11 @@ msgstr ""
 "werden folgende Pakete gelöscht:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Einige Pakete können nicht entfernt werden"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1406,8 +1199,7 @@ msgstr ""
 "Das Entfernen dieser Pakete würde Ihr System unbrauchbar machen:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1416,13 +1208,11 @@ msgstr ""
 "Um die Abhängigkeiten zu berücksichtigen, muss die Auswahl folgender\n"
 "Pakete zurückgesetzt werden:\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Es werden zusätzliche Pakete benötigt"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1432,18 +1222,17 @@ msgstr ""
 "Pakete ebenfalls installiert werden:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (gehört zur Skipliste)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Einige Pakete konnten nicht installiert werden"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1453,123 +1242,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Einige Pakete müssen entfernt werden"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Gewählte Größe: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Keine Beschreibung für dieses Paket verfügbar\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Sicherheitsupdates"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Fehlerkorrekturen"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Installieren"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normale Updates"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Installieren"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s Auswahl"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux Auswahl"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Alle Pakete, alphabetisch sortiert"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Alle Pakete, nach Gruppe"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Alle Pakete nach Verfügbarkeit"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Alle Pakete, nach Größe"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Alle Pakete, nach Auswahlstadium"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Alle Pakete, nach Medien"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Alle Pakete nach Verfügbarkeit"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Verbleibende, sortiert nach Installationsdatum"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Alle Pakete, nach Gruppe"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normale Updates"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Fehlerkorrekturen"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normale Updates"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Sicherheitsupdates"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "in Namen"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "in Beschreibungen"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "in Dateinamen"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normale Informationen"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Alle Informationen"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Sie müssen erst einige Pakete auswählen."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Zu viele Pakete ausgewählt"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1586,7 +1360,7 @@ msgstr ""
 "Wollen Sie wirklich alle markierten Pakete installieren?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1600,89 +1374,100 @@ msgstr ""
 "\n"
 "Soll ich fortfahren?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Datei"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Medien aktualisieren"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Auswahl zurücksetzen"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Paketliste neu laden"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Beenden"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Bearbeiten"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Automatisch markierte Pakete anzeigen"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Update"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Finden:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Suche"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Löschen"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installieren"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Fataler Fehler"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Fataler Fehler aufgetreten: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1694,13 +1479,12 @@ msgstr ""
 "\n"
 "Soll ich fortfahren?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Updatemedium existiert bereits"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1715,13 +1499,12 @@ msgstr ""
 "Aktiviert? Spalte ein)\n"
 "Starten Sie anschließend erneut %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Wie Sie Ihren Paketserver selbst auswählen"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1735,58 +1518,56 @@ msgstr ""
 "\n"
 "Starten Sie anschließend erneut %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Suche nach vorhandenen Paketen, bitte warten ..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Lese die Paketdatenbank, bitte warten ..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Untersuche %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "Änderungen:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Entferne .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Verwende .%s als Hauptdatei"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Nichts machen"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Installation beendet"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Untersuche ..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Alle gewählten Pakete wurden erfolgreich installiert."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Fehler bei der Installation"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1796,18 +1577,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Kann Quellpakete nicht bekommen."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ich kann leider die Quellpakete nicht bekommen.%s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1819,38 +1599,34 @@ msgstr ""
 "Fehler gemeldet:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Installiere die Pakete ..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Initialisierung ..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Installiere die Pakete ..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Medium wechseln"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Bitte legen Sie das Medium „%s“ in Laufwerk [%s] ein"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Besorge Paket „%s“ (%s/%s) ..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Überprüfe Paketsignaturen..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1864,13 +1640,12 @@ msgstr ""
 "\n"
 "Soll ich fortfahren?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Installation schlug fehl"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1882,23 +1657,21 @@ msgstr ""
 "\n"
 "Sie sollten Ihre Paketliste aktualisieren."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Bereite Paketinstallation vor ..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installiere Paket „%s“ (%s/%s) ..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "Zugriff auf RPM-Datei [%s] nicht möglich"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1911,44 +1684,34 @@ msgstr ""
 "Sie können diese nun genauer betrachten, um möglicherweise notwendige "
 "Aktionen vorzunehmen:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Diese Pakete kommen mit Aktualisierungsinformationen"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Mehr Paketinformationen ... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Kein Paket zum Installieren gefunden."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Unbehebbarer Fehler: es wurde kein Paket zum Installieren gefunden,sorry."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Lese die Paketdatenbank, bitte warten ..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Entferne die Pakete, bitte warten ..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Fehler beim Entfernen"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1958,8 +1721,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1971,8 +1733,8 @@ msgstr ""
 "Dieses Programm wird Ihnen helfen, die Softwarepakete auszuwählen,\n"
 "die Sie von Ihrem Computer entfernen wollen."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1984,13 +1746,11 @@ msgstr ""
 "Dieses Werkzeug möchte Ihnen bei der Entscheidung helfen, welche \n"
 "aktualisierten Pakete Sie installieren wollen."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Willkommen beim Werkzeug zur Softwareinstallation!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -2004,214 +1764,172 @@ msgstr ""
 "Softwarepaketen auf CD-ROM oder DVD. Dieses Programm möchte\n"
 "Ihnen bei der Auswahl der für Sie interessanten Pakete helfen."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Softwareaktualisierung"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Update"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Softwareaktualisierung"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Bitte geben Sie Ihre Berechtigung für den Zugang zum Proxy ein \n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Benutzername:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Softwarepakete entfernen"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Aktualisierung für Softwarepakete"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Softwarepakete installieren"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nein"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Info ..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Österreich"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australien"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Tschechische Republik"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Deutschland"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Dänemark"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Griechenland"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finnland"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Frankreich"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italien"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norwegen"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polen"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Russland"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Schweden"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Großbritannien"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2223,8 +1941,7 @@ msgstr ""
 "\n"
 "Fortfahren?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2236,23 +1953,26 @@ msgstr ""
 "\n"
 "Ist es OK fortzufahren?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s Auswahl"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Bitte warten, besorgen der Spiegelserveradressen."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Bitte warten: Besorgen der Serverliste vom Mandriva-Server."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Fehler während des Besorgens"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2266,8 +1986,8 @@ msgstr ""
 "Das Netzwerk, oder die Webseite sind nicht erreichbar.\n"
 "Bitte versuchen Sie es später erneut."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2280,18 +2000,15 @@ msgstr ""
 "%s\n"
 "Bitte versuchen Sie es später erneut."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Kein Mirror"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Ich kann keinen passenden Spiegelserver finden."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2305,69 +2022,64 @@ msgstr ""
 "ist, dass es für Ihre Prozessorarchitektur keine regulären Mandriva Linux\n"
 "Aktualisierungen gibt."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Bitte wählen Sie Ihren bevorzugten Mirror."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Datei für Medium „%s“ kopieren ..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Untersuche Datei des Mediums „%s“ ..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Untersuche Datei auf Medium „%s“ ..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " fertig."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " gescheitert!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s von Medium %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Starte das Besorgen von „%s“ ..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Besorgen von „%s“, Dauer: %s, Geschwindigkeit: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Besorgen von „%s“, Geschwindigkeit: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Aktualisiere Medium, bitte warten ..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Fehler beim Abrufen von Paketen"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2384,36 +2096,31 @@ msgstr ""
 "nicht\n"
 "erreichbar und Sie sollten es später nochmals versuchen."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Medien aktualisieren"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Kein aktives Medium gefunden. Sie müssen Medien aktivieren, um diese "
 "aktualisieren zu können."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Bitte wählen Sie die zu aktualisierenden Medien:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Alles auswählen"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2425,8 +2132,8 @@ msgstr ""
 "Fehler:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2435,18 +2142,16 @@ msgstr ""
 "Konnte das Medium nicht hinzufügen, Fehlerbericht:\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Ich kann das Medium nicht anlegen."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Fehler beim Hinzufügen des Mediums"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2456,8 +2161,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2467,8 +2172,8 @@ msgstr ""
 "der Version von %s, welche Sie benutzen (%s), überein.\n"
 "Es wird deaktiviert."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2478,13 +2183,11 @@ msgstr ""
 "Mandriva Linux Version überein (%s).\n"
 "Es wird deaktiviert."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Hilfe im Hintergrund gestartet"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2761,3 +2464,15 @@ msgstr "Software entfernen"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Paketquellen-Manager"
+
+#~ msgid "Stop"
+#~ msgstr "Stopp"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Alle Pakete, nach Medien"
+
+#~ msgid "Normal information"
+#~ msgstr "Normale Informationen"
+
+#~ msgid "Maximum information"
+#~ msgstr "Alle Informationen"
diff --git a/po/el.po b/po/el.po
index 82eb73b3..efb7d782 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,7 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-el\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2006-03-13 10:55+0200\n"
 "Last-Translator: Theophanis Mastakas <mastakas@otenet.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -21,13 +22,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Επιλέξτε είδος μέσων"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -52,18 +51,16 @@ msgstr ""
 "αλλά θα πρέπει\n"
 "να το κάνετε σε δύο στάδια.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Πηγές διανομής"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Επίσημες αναβαθμίσεις"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -82,104 +79,86 @@ msgstr ""
 "\n"
 "Να συνεχίσω;"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Παρακαλώ περιμένετε, προσθήκη μέσου..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Προσθήκη ενός μέσου"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Τοπικά αρχεία"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Θέση:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Διακομιστής FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "Διακομιστής  RSYNC"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Διακομιστής HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Αφαιρούμενη συσκευή"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Θέση ή σημείο προσάρτησης:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Αφαιρούμενη συσκευή"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Αναζήτηση..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Προσπέλαση:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Σχετική θέση των synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:190
+#, fuzzy
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Αν μείνει κενό, το synthesis/hdlist  θα επιμεληθεί αυτόματα"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Όνομα:"
 
 #: ../edit-urpm-sources.pl:203
-#, fuzzy, c-format
+#, fuzzy
 msgid "Create media for a whole distribution"
 msgstr "Δημιουργία μέσων για μια ολόκληρη διανομή"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Αναζήτηση για αναβαθμίσεις στο μέσον"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Πρέπει να συμπληρώσετε τουλάχιστον τα δύο πρώτα πεδία."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -187,13 +166,11 @@ msgstr ""
 "Υπάρχει ήδη ένα μέσο με αυτό το όνομα, είστε βέβαιοι\n"
 "για την αντικατάστασή του;"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Προσθήκη ενός μέσου:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Τύπος μέσου:"
 
@@ -201,10 +178,9 @@ msgstr "Τύπος μέσου:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -213,102 +189,88 @@ msgstr "Ακύρωση"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "OK"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Καθολικές επιλογές για εγκατάσταση πακέτου"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "πάντα"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "ποτέ"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Επιβεβαιώστε RPMs προς εγκατάσταση:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Λήψη προγράμματος προς χρήση:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Αφαίρεση Πηγής"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Είστε βέβαιοι για την αφαίρεση της πηγής\" %s \";"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Παρακαλώ περιμένετε, αφαιρείται το μέσο..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Επεξεργασία ενός μέσου"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Επεξεργασία μέσου \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Αποθήκευση αλλαγών"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Διαμεσολαβητής..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Πρέπει να εισάγετε το μέσο για να συνεχίσετε"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 "Για να αποθηκευτούν οι αλλαγές, θα πρέπει να εισάγετε το μέσο στον οδηγό."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Ρύθμιση διαμεσολαβητών"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Ρυθμίσεις διαμεσολαβητή για μέσον \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Καθολικές ρυθμίσεις διαμεσολαβητή"
 
 #: ../edit-urpm-sources.pl:468
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -318,143 +280,121 @@ msgstr ""
 "> / <proxyhost[:port]>)"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Όνομα κεντρικού υπολογιστή διαμεσολαβητή:"
 
 #: ../edit-urpm-sources.pl:474
-#, fuzzy, c-format
+#, fuzzy
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Μπορείτε να ορίσετε ένα χρήστη/κωδικό για την πιστοποίηση ταυτότητας του "
 "διαμεσολαβητή:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Χρήστης:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Προσθήκη παράλληλης ομάδας"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Επεξεργασία μιας παράλληλης ομάδας"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Προσθήκη ενός ορίου μέσου"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Επιλέξτε ένα μέσο για προσθήκη στο όριο μέσων:"
 
 #: ../edit-urpm-sources.pl:605
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a host"
 msgstr "Προσθήκη ενός κεντρικού υπολογιστή"
 
 #: ../edit-urpm-sources.pl:611
-#, fuzzy, c-format
+#, fuzzy
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 "Εισάγετε το όνομα του κεντρικού υπολογιστή ή την διεύθυνση IP του προς "
 "προσθήκη κεντρικού υπολογιστή: "
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Επεξεργασία παράλληλης ομάδας \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Όνομα ομάδας:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Πρωτόκολλο:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Όριο μέσου:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Προσθήκη"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Αφαίρεση"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Κεντρικοί Υπολογιστές:"
 
 #: ../edit-urpm-sources.pl:690
-#, fuzzy, c-format
+#, fuzzy
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ρυθμίστε παράλληλο urpmi (κατανεμημένη εκτέλεση του urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Ομάδα"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Πρωτόκολλο"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Όριο μέσων"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Πρωτόκολλο"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Εντολή"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Επεξεργασία"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Προσθήκη..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Διαχείριση κλειδιών για πακέτα με ψηφιακές επιλογές"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Μέσο"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -463,28 +403,25 @@ msgstr ""
 "Κλειδιά"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 "δε βρέθηκε όνομα, το κλειδί δεν υπάρχει στη διαδικασία κλειδιού του rpm "
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Προσθήκη ενός κλειδιού"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Επιλέξτε ένα κλειδί για να προστεθεί στο μέσο %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Αφαίρεση ενός κλειδιού"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -493,39 +430,33 @@ msgstr ""
 "(όνομα κλειδιού: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Προσθήκη ενός κλειδιού..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Αφαίρεση κλειδιού"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Ρύθμιση μέσων"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Ενεργοποίηση;"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Αναβαθμίσεις ;"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Το μέσο χρήζει αναβάθμισης για να είναι χρησιμοποιήσιμο. Ν' αναβαθμιστεί "
 "τώρα ;"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -535,38 +466,33 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "Προσθήκη προσαρμογής..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Αναβάθμιση..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Διαχείριση κλειδιών..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Παράλληλη..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Καθολικές επιλογές..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -576,8 +502,7 @@ msgstr ""
 "\n"
 "Να συνεχιστεί;"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -592,8 +517,7 @@ msgstr ""
 "να \n"
 "εγκατασταθούν σαν νέα πακέτα ή να αναβαθμίσετε υπάρχοντα πακέτα."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -606,13 +530,23 @@ msgstr ""
 "μέσων σε άλλη επιφάνεια εργασίας, ή κάνετε επί του παρόντος εγκατάσταση "
 "πακέτων ;)"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Αδυναμία προσθήκης μέσου, εσφαλμένα ή ελλειπή ορίσματα"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Πρόκειται να προσθέσετε ένα νέο μέσο πακέτων, '%s'.\n"
+"Αυτό σημαίνει ότι θα 'μπορείτε να προσθέσετε νέα πακέτα λογισμικού\n"
+"στο σύστημα σας από το νέο μέσο"
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -622,18 +556,22 @@ msgstr ""
 "Αυτό σημαίνει ότι θα 'μπορείτε να προσθέσετε νέα πακέτα λογισμικού\n"
 "στο σύστημα σας από το νέο μέσο"
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Επιτυχής προσθήκη μέσου '%s'"
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Επιτυχής προσθήκη μέσου '%s'"
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -641,80 +579,75 @@ msgstr ""
 "  --changelog-first      προβολή του changelog πριν του filelist στο "
 "παράθυρο περιγραφης"
 
-#: ../rpmdrake:37
-#, fuzzy, c-format
+#: ../rpmdrake:40
+#, fuzzy
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     όριο στα δεδομένα μέσα"
 
-#: ../rpmdrake:38
-#, fuzzy, c-format
+#: ../rpmdrake:41
+#, fuzzy
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     προτείνεται η συγχώνευση όλων των αρχείων .rpmnew/."
 "rpmsave που βρέθηκαν"
 
-#: ../rpmdrake:39
-#, fuzzy, c-format
+#: ../rpmdrake:42
+#, fuzzy
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            ρυθμίστε κατάσταση (εγκατάσταση (προεπιλεγμένη), "
 "αφαίρεση, αναβάθμιση)"
 
-#: ../rpmdrake:40
-#, fuzzy, c-format
+#: ../rpmdrake:43
+#, fuzzy
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      να μην ζητηθεί αρχική ερώτηση επιβεβαίωσης σε "
 "κατάσταση αναβαθμίσεως"
 
-#: ../rpmdrake:41
-#, fuzzy, c-format
+#: ../rpmdrake:44
+#, fuzzy
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 "  --no-media-update      να μη γίνεται αναβάθμιση μέσων κατά την εκκίνηση"
 
-#: ../rpmdrake:42
-#, fuzzy, c-format
+#: ../rpmdrake:45
+#, fuzzy
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 "  --no-verify-rpm         να μη γίνεται επιβεβαίωση υπογραφών των πακέτων"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr "  --parallel"
 
-#: ../rpmdrake:44
-#, fuzzy, c-format
+#: ../rpmdrake:47
+#, fuzzy
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nose=pkg1,..    προβολή μόνο αυτών των πακέτων"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..     προεπιλογή αυτών των πακέτων"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root               προτροπή να εκτελεστεί ως βασικό/root"
 
-#: ../rpmdrake:47
-#, fuzzy, c-format
+#: ../rpmdrake:50
+#, fuzzy
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg         εκτελέστε αναζήτηση για \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Εκτέλεση σε λειτουργία χρήστη"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -724,634 +657,518 @@ msgstr ""
 " Δεν θα μπορείτε να εκτελέσετε τροποποιήσεις στο σύστημα σας,\n"
 "αλλά θα μπορείτε να περιηγηθείτε στην υπάρχουσα βάση δεδομένων."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Προσιτότητα"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Αρχειοθέτηση"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Αντίγραφα Ασφαλείας"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Εγγραφή Cd"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Συμπίεση"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Άλλα"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Βιβλία"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Βιβλία υπολογιστών"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Συχνές Ερωτήσεις"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Λογοτεχνία"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Συγκρότημα"
 
-#: ../rpmdrake:198
-#, fuzzy, c-format
+#: ../rpmdrake:208
+#, fuzzy
 msgid "Message Passing"
 msgstr "Διαβίβαση μηνύματος"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Στοίχιση Υπηρεσιών"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Επικοινωνίες"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Βάσεις Δεδομένων"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Ανάπτυξη"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Ανάπτυξη"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME και GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE και Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Πυρήνας"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Διορθωτές"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Εκπαίδευση"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Εξομοιωτές"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Εργαλεία αρχείων"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Παιχνίδια"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Περιπέτεια"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Παιχνίδια"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Ηλεκτρονικά"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Επιτραπέζια"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Χαρτιά"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Παζλ"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Αθλητικά"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Στρατηγική"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Γραφικές Επιφάνειες Εργασίας"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Γραφικές Επιφάνειες Εργασίας"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Τύπου FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Γραφικά"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Παρακολούθηση"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Πολυμέσα"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Δικτύωση"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Συζήτηση"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Δικτύωση"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Μεταφορά Αρχείου"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Στιγμιαία μηνύματα"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Ταχυδρομείο"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Ειδήσεις"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Απομακρυσμένη πρόσβαση"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "Ιστοσελίδες"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Γραφείο"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Δημόσια κλειδιά"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Εκδόσεις"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Επιστήμες"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Αστρονομία"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Επιστήμες"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Βιολογία"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Χημεία"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Επιστήμη υπολογιστών"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Φυσικές Επιστήμες"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Μαθηματικά"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Φυσική"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Κελύφοι"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Ήχος"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Σύστημα"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Βάση"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Ρυθμίσεις"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Σύστημα"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Εκκίνηση και Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Ρυθμίσεις"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Υλικό"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Πακετοποίηση"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Εκτύπωση"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Ανάπτυξη"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Ανάπτυξη"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Γραμματοσειρές"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Κονσόλα"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Γραμματοσειρές"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Διεθνοποίηση"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Πυρήνας και υλικό"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Βιβλιοθήκες"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Διακομιστές"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Τερματικά"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Εργαλεία κειμένου"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Παιχνιδάκια"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Βίντεο"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Δεν είναι διαθέσιμο/η)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Αποτέλεσμα Αναζήτησης"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Αποτέλεσμα Αναζήτησης (κανένα)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Παρακαλώ περιμένετε, γίνεται αναζήτηση..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Τερματισμός"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Προστιθέμενα"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Αναβαθμίσιμα"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Προστιθέμενα"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Μη επιλεγμένα"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Επιλεγμένα"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Μη επιλεγμένα"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Σπουδαιότητα: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Αιτία αναβάθμισης: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Χωρίς περιγραφή"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Άρχεία:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Αλλαγές:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Μέσο: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Τρέχουσα εγκατεστημένη έκδοση: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Έκδοση: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Αρχιτεκτονική: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Μέγεθος: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Σπουδαιότητα: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Μέγεθος: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Σύνοψη: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Αιτία αναβάθμισης: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Περιγραφή: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Χωρίς περιγραφή"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Περισσότερες πληροφορίες για το πακέτο..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Παρακαλώ επιλέξτε"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Ένα από τα παρακάτω πακέτα απαιτούνται:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Παρακαλώ επιλέξτε"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Παρακαλώ περιμένετε, ταξινομούνται τα πακέτα"
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Χωρίς αναβαθμίσεις"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1361,29 +1178,24 @@ msgstr ""
 "υπάρχουν διαθέσιμα πακέτα για αναβάθμιση για τα εγκατεστημένα\n"
 "πακέτα του υπολογιστή σας ή τα έχετε ήδη αναβαθμίσει."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Όλα"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Περισσότερες πληροφορίες"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Πληροφορίες για τα πακέτα"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Ορισμένα επιπλέον πακέτα πρέπει να αφαιρεθούν"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1393,13 +1205,11 @@ msgstr ""
 "να αφαιρεθούν:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Ορισμένα πακέτα δεν μπορούν να αφαιρεθούν"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1407,8 +1217,7 @@ msgstr ""
 "Συγνώμη, αλλά η αφαίρεση αυτών των πακέτων θα καταστρέψει το σύστημά σας:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1418,13 +1227,11 @@ msgstr ""
 "να αποεπιλεγούν:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Απαιτούνται επιπλέον πακέτα"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1434,18 +1241,17 @@ msgstr ""
 " τα παρακάτω πακέτα:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, fuzzy, c-format
+#: ../rpmdrake:875
+#, fuzzy, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (ανήκει στη λίστα των προς παράβλεψη)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Ορισμένα πακέτα δεν μπορούν να εγκατασταθούν"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1455,123 +1261,109 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Ορισμένα πακέτα πρέπει να αφαιρεθούν"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Επιλεγμένο: %d MB/ Ελεύθερος χώρος στον δίσκο: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Επιλεγμένο μέγεθος: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Μη διαθέσιμη περιγραφή γι'αυτό το πακέτο\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Αναβαθμίσεις Ασφαλείας"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Αναβαθμίσεις διορθώσεων"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Εγκατάσταση"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Κανονικές αναβαθμίσεις"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Εγκατάσταση"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s επιλογές"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Επιλογές Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Όλα τα πακέτα, αλφαβητικά"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Όλα τα πακέτα, βάση ομάδας"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Όλα τα πακέτα, βάση διαθεσιμότητας αναβάθμισης"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Όλα τα πακέτα, βάση μεγέθους"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Όλα τα πακέτα, βάση κατάστασης επιλογής"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Ολα τα πακέτα βάση χώρου απόθεσης μέσου"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Όλα τα πακέτα, βάση διαθεσιμότητας αναβάθμισης"
-
-#: ../rpmdrake:982
-#, fuzzy, c-format
+#: ../rpmdrake:1010
+#, fuzzy
 msgid "Leaves only, sorted by install date"
 msgstr "Τερματικοί κόμβοι μόνο, ταξινομημένοι κατά ημερομηνία εγκατάστασης"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Όλα τα πακέτα, βάση ομάδας"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Κανονικές αναβαθμίσεις"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Αναβαθμίσεις διορθώσεων"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Κανονικές αναβαθμίσεις"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Αναβαθμίσεις Ασφαλείας"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "στα ονόματα"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "στις περιγραφές"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "στα ονόματα αρχείων"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Κανονικές πληροφορίες"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Μέγιστες πληροφορίες"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Πρέπει να επιλέξετε πρώτα κάποια πακέτα."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Έχουν επιλεγεί πάρα πολλά πακέτα"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1588,7 +1380,7 @@ msgstr ""
 " Είστε βέβαιοι για την εγκατάσταση των επιλεγμένων πακέτων;"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1602,89 +1394,100 @@ msgstr ""
 "\n"
 "Να συνεχιστεί;"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Αρχείο"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Αναβάθμιση μέσων"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Επαναφορά της επιλογής"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Επαναφόρτωση της _λίστας πακέτων"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Εξοδος"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Επιλογές"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Αυτόματη προβολή επιλεγμένων πακέτων"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Αναβάθμιση Mandriva Linux "
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Εύρεση:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Καθαρισμός"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Εγκατάσταση"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Μοιραίο σφάλμα"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Συνέβη ένα μοιραίο σφάλμα: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1697,13 +1500,12 @@ msgstr ""
 "\n"
 "Να συνεχίσω;"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Ήδη υπάρχοντα μέσα αναβάθμισης"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1719,13 +1521,12 @@ msgstr ""
 "\n"
 "Μετά, επανεκκινήστε το %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Πως να επιλέξετε μόνοι σας την εναλλακτική διεύθυνση σας"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1739,58 +1540,56 @@ msgstr ""
 "\n"
 "Μετά, επανεκκινήστε το %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Παρακαλώ περιμένετε, αναζητούνται τα διαθέσιμα πακέτα..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Παρακαλώ περιμένετε, διαβάζεται η βάση δεδομένων των πακέτων..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Ελέγχεται το %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "αλλαγές:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Αφαίρεση.%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Χρήση του .%s ως κύριο αρχείο"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Να μη γίνει τίποτα"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Η εγκατάσταση τελείωσε"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Έλεγχος..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Όλα τα ζητηθέντα πακέτα εγκαταστάθηκαν επιτυχώς."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Πρόβλημα κατά την εγκατάσταση"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1800,18 +1599,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Αδύνατη η λήψη των πηγαίων πακέτων."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Αδυναμία λήψης πηγαίων πακέτων, συγνώμη. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1823,38 +1621,34 @@ msgstr ""
 "Αναφερθέντα σφάλματα:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Εγκατάσταση πακέτου..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Αρχικοποίηση..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Εγκατάσταση πακέτου..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Αλλαγή μέσου"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Παρακαλώ εισάγετε το μέσο με όνομα \"%s\" στη συσκευή [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Γίνεται η λήψη του πακέτου `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Επαλήθευση υπογραφών πακέτων..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1868,13 +1662,12 @@ msgstr ""
 "\n"
 "Θέλετε να συνεχιστεί η εγκατάσταση;"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1886,23 +1679,21 @@ msgstr ""
 "\n"
 "Ίσως να πρέπει να αναβαθμίσετε την βάση δεδομένων των μέσων."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Προετοιμασία πακέτων για εγκατάσταση..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "αδυναμία πρόσβασης στο αρχείο rpm [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1914,43 +1705,33 @@ msgstr ""
 "Ορισμένα αρχεία ρυθμίσεων δημιουργήθηκαν ως `.rpmnew' ή`.rpmsave',\n"
 "ίσως πρέπει να ελέγξετε μερικά για να εκτελέσετε ορισμένες ενέργειες:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Αυτά τα πακέτα διαθέτουν πληροφορία αναβάθμισης"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Περισσότερες πληροφορίες για το πακέτο...[%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Δεν βρέθηκε πακέτο για εγκατάσταση."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Μη επανακτήσιμο σφάλμα: δεν βρέθηκε πακέτο για εγκατάσταση, λυπάμαι."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Παρακαλώ περιμένετε, διαβάζεται η βάση δεδομένων των πακέτων..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Παρακαλώ περιμένετε, αφαιρούνται τα πακέτα..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Πρόβλημα κατά την αφαίρεση"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1960,8 +1741,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1973,8 +1753,8 @@ msgstr ""
 "Αυτό το εργαλείο θα σας βοηθήσει να επιλέξετε το πρόγραμμα που θέλετε\n"
 "να αφαιρέσετε από τον υπολογιστή σας."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1986,13 +1766,11 @@ msgstr ""
 "Αυτό το εργαλείο θα σας βοηθήσει να επιλέξετε τις αναβαθμίσεις που θέλετε\n"
 "να εγκαταστήσετε στον υπολογιστή σας."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Καλώς ήρθατε στο εργαλείο εγκατάστασης λογισμικού"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -2006,214 +1784,172 @@ msgstr ""
 "Αυτό το εργαλείο θα σας βοηθήσει να επιλέξετε το πρόγραμμα που θέλετε\n"
 "να εγκαταστήσετε στον υπολογιστή σας."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Αναβάθμιση Λογισμικού"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Αναβάθμιση Mandriva Linux "
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Αναβάθμιση Λογισμικού"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Παρακαλώ εισάγετε  πιστοποίηση για πρόσβαση διαμεσολαβητή\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Όνομα χρήστη:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Αφαίρεση Πακέτων Λογισμικού"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Αναβάθμιση Πακέτων Λογισμικού"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Εγκατάσταση Πακέτων Λογισμικού"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Όχι"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ναι"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Πληροφορίες..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Αυστρία"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Αυστραλία"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Βέλγιο"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Βραζιλία"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Καναδάς"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Ελβετία"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Κόστα Ρίκα"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Τσεχία"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Γερμανία"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Δανία"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Ελλάδα"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Ισπανία"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Φινλανδία"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Γαλλία"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ουγγαρία"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Ισραήλ"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Ιταλία"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Ιαπωνία"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Κορέα"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Ολλανδία"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Νορβηγία"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Πολωνία"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Πορτογαλία"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Ρωσία"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Σουηδία"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Σιγγαπούρη"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Σλοβακία"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Ταϊβάν"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Ηνωμένο Βασίλειο"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Κίνα"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Ηνωμένες Πολιτείες Αμερικής"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2226,8 +1962,7 @@ msgstr ""
 "\n"
 "Να συνεχίσω;"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2240,25 +1975,28 @@ msgstr ""
 "\n"
 "Να συνεχίσω;"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s επιλογές"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Παρακαλώ περιμένετε, γίνεται η λήψη των εναλλακτικών διευθύνσεων."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Παρακαλώ περιμένετε γίνεται η λήψη των διευθύνσεων των εναλλακτικών θέσεων "
 "από την ιστοσελίδα της Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Σφάλμα κατά τη λήψη"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2272,8 +2010,8 @@ msgstr ""
 "Το δίκτυο ή η ιστοσελίδα μπορεί να μην είναι διαθέσιμα.\n"
 "Παρακαλώ προσπαθήστε ξανά αργότερα."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2287,18 +2025,15 @@ msgstr ""
 "Το δίκτυο ή η ιστοσελίδα της Mandriva μπορεί να μην είναι διαθέσιμη.\n"
 "Παρακαλώ προσπαθήστε ξανά αργότερα."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Χωρίς εναλλακτικές διευθύνσεις"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Δεν μπορώ να βρω κατάλληλη εναλλακτική διεύθυνση"
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2313,69 +2048,64 @@ msgstr ""
 "η αρχιτεκτονική του επεξεργαστή σας από τις επίσημες αναβαθμίσεις της\n"
 "Mandriva Linux"
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Παρακαλώ επιλέξτε την επιθυμητή εναλλακτική."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Αντιγραφή αρχείου από το μέσο `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Εξέταση αρχείο από το μέσο `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Εξέταση απομακρισμένου αρχείου του μέσου `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " τέλος."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " απέτυχε!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s για το μέσο %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Εκκίνηση λήψης του `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Λήψη του `%s', χρόνος που απομένει:%s, ταχύτητα:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Λήψη του `%s', ταχύτητα:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Παρακαλώ περιμένετε, ανανεώνεται το μέσο..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Σφάλμα κατά την ανάκτηση πακέτων"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2392,36 +2122,31 @@ msgstr ""
 " να το ξανά-ρυθμίσετε, είτε είναι προς το παρόν μη προσβάσιμο και πρέπει να "
 "προσπαθήσετε ξανά αργότερα."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Ανανέωση μέσων"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Δεν βρέθηκε ενεργό μέσο.Πρέπει να ενεργοποιήσετε ορισμένα μέσα για τη "
 "δυνατότητα αναβάθμισης των."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Επιλέξτε τα μέσα που θέλετε να ανανεώσετε:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Επιλογή όλων"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Ανανέωση"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2432,8 +2157,8 @@ msgstr ""
 "Σφάλματα:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2443,18 +2168,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Αδυναμία δημιουργίας μέσου."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Αποτυχία κατά την προσθήκη μέσου"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2464,8 +2187,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2475,8 +2198,8 @@ msgstr ""
 "έκδοση του %s που εκτελείτε (%s).\n"
 "Θα απενεργοποιηθεί "
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2486,13 +2209,11 @@ msgstr ""
 "εκτελούμενη έκδοση της Mandriva Linux (%s).\n"
 "Θα απενεργοποιηθεί "
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Η βοήθεια ξεκίνησε στο παρασκήνιο"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2769,3 +2490,15 @@ msgstr "Αφαίρεση Λογισμικού"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Διαχειριστής Μέσων Λογισμικού"
+
+#~ msgid "Stop"
+#~ msgstr "Τερματισμός"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Ολα τα πακέτα βάση χώρου απόθεσης μέσου"
+
+#~ msgid "Normal information"
+#~ msgstr "Κανονικές πληροφορίες"
+
+#~ msgid "Maximum information"
+#~ msgstr "Μέγιστες πληροφορίες"
diff --git a/po/eo.po b/po/eo.po
index b06c7943..493739b3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-eo\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2003-08-21 11:57+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -19,13 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -39,18 +38,17 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:85
+#, fuzzy
 msgid "Official updates"
 msgstr "Normalaj ĝisdatigoj"
 
-#: ../edit-urpm-sources.pl:87
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:88
+#, fuzzy, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -65,104 +63,87 @@ msgstr ""
 "\n"
 "Ĉu mi nun daŭrigu?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Bonvole atendu, mi ĝisdatigas..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Aldonas datenportilon"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokaj dosieroj"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Pado:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Servilo FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "Servilo FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Servilo HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Retirebla datenportilo"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Pado aŭ surmetingo:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Retirebla datenportilo"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Foliumi..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Salutnomo:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Passvorto:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativa pado al syngthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nomo:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Bonvole elektu la datenportilon kiun vi deziras ĝisdatigi:"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Vi devas plenigi almenaŭ la du unuajn kampojn."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -170,13 +151,11 @@ msgstr ""
 "Ekzistas jam portilo kun tiu nomo, ĉu vi\n"
 "vere deziras anstataŭigi ĝin?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Aldonante portilon:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Speco de datenportilo:"
 
@@ -184,10 +163,9 @@ msgstr "Speco de datenportilo:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Forigu"
 
@@ -196,102 +174,92 @@ msgstr "Forigu"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Jes"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Preparas instaldon de pakaĵoj..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, fuzzy, c-format
+#, fuzzy
 msgid "never"
 msgstr "Serviloj"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Kelkaj pakaĵoj ne instaleblas"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Deŝuto de `%s', rapideco:%s"
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Malinstalilo por program-pakaĵoj"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Bonvolu atendi, mi forigas portilon..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Redaktu Portilon"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Redaktante portilon \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Konservu la ŝanĝojn"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Prokuro (Proxy)..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Vi devas enigi la portilon por daŭrigi"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 "Por konservi viaĵn ŝanĝojn, vi devas enigi la datenportilon en la diskingon."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Konfiguro de prokuroj"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -300,241 +268,206 @@ msgstr ""
 "kaj opcie pordon (sintakso: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Salutnomo por prokura servilo:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Vi povas difini salutnomon/pasvorton por la prokura aŭtentigo:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Uzulo:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Aldonu paralelan grupon"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Redaktu paralelan grupon"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Aldonu limon de portilo"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Elektu portilon por aldoni en la portilolimo:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Aldonu servilon"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Entajpu la servilnomon aŭ IP-adreson de la aldonenda gastiganto:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redaktu paralelan grupon \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Grupnomo:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protikolo:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Limo de portilo:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Aldonu"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Malinstalu"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Gastigantoj:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfiguru paralelan urpmi (distribuitan plenumon de urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grupo"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokolo"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Portil-limo"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokolo"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Komando"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(nenio)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Redaktu..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Aldonu..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Pakaĵportilo"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:789
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a key"
 msgstr "Aldonu..."
 
 #: ../edit-urpm-sources.pl:801
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Elektu portilon por aldoni en la portilolimo:"
 
 #: ../edit-urpm-sources.pl:829
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remove a key"
 msgstr "Malinstalu programo(j)n"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:848
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a key..."
 msgstr "Aldonu..."
 
 #: ../edit-urpm-sources.pl:852
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remove key"
 msgstr "Malinstalu"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Konfiguro de datenportilo"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Ĉu enŝaltita?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Ĝisdatigu"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "Aldonu..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Ĝisdatigo..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralela..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Helpo"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -544,8 +477,7 @@ msgstr ""
 "\n"
 "Ĉu mi nun daŭrigu?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -560,8 +492,7 @@ msgstr ""
 "pakaĵojn\n"
 "aŭ por ĝisdatigi."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -569,102 +500,100 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
 "to your system from that new medium."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, perl-format
+msgid "Successfully added media %s."
+msgstr ""
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Uzado: %s [OPCIOJ]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Rulanta en uzul-modo"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -674,634 +603,521 @@ msgstr ""
 "Vi ne povos fari modifojn en la sistemo,\n"
 "sed vi povos daŭre trarigardi la ekzistantan datenbazon."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Alirebleco"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arkivado"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Savkopio"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "KD-skribado"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Kompaktado"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Alia"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Libroj"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Komputilaj libroj"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Respondaro"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Kielfari (Howtos)"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literaturo"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikaĵoj"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Datenbazoj"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Programado"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Programado"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME kaj GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE kaj Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kerno"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Redaktiloj"
 
-#: ../rpmdrake:213
-#, fuzzy, c-format
+#: ../rpmdrake:224
+#, fuzzy
 msgid "Education"
 msgstr "Komunikaĵoj"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Imitiloj"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Dosieriloj"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Ludoj"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Aventuro"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Ludoj"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Kartoj"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kartoj"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzloj"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sporto"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategio"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Grafika labortabulo"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Grafika labortabulo"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Bazita sur FVMW"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafikoj"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitorado"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Sono kaj filmo"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Retumado"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Babilo"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Retumado"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Dosiertransigo"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Instant messaging"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Poŝto"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Novaĵoj"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Defora atingo"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "TTT"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Oficejo"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publikado"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Sciencoj"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomio"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Sciencoj"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologio"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kemio"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Komputilscienco"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geosciencoj"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematiko"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fiziko"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Ŝeloj"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Sono"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Sistemo"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Bazo"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfigurado"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Sistemo"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Starto kaj inico"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigurado"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Aparataro"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakante"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Presante"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Programado"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Programado"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Tiparoj"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsolo"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Tiparoj"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "TTF-tiparo"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Speco1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11-bitmapo"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internaciigo"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kerno kaj aparataro"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Libraroj"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Serviloj"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminaloj"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Tekstiloj"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Ludiloj"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Vidbendo"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Neatingebla)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Serĉrezultoj"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Serĉrezultoj (neniu)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Bonvole atendu dum mi serĉas..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Haltu"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Aldonebla"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Ĝisdatigebla"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Aldonebla"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Ne elektita"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Elektita(j)"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Ne elektita"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Graveco: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Kialo por ĝisdatigi: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "en priskriboj"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Dosieroj:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Portilo: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Nun instalita versio: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versio: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Grandeco: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Graveco: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Grandeco: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Resumo: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Kialo por ĝisdatigi: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Priskribo: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "en priskriboj"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Kromaj informoj pri pakaĵo..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Bonvole elektu"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Necesas unu el la sekvaj pakaĵoj:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Bonvole elektu"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Bonvole atendu, mi listigas pakaĵojn..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Neniu ĝisdatigo"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1311,29 +1127,24 @@ msgstr ""
 "akirebla ĝisdatigo por la pakaĵoj instalitaj en via komputilo,\n"
 "aŭ vi jam instalis ilin ĉiujn."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Ĉiuj"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Pli da informo"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informo pri pakaĵoj"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Kelkaj kromaj pakaĵoj devas esti forigitaj"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1343,13 +1154,11 @@ msgstr ""
 "pakaĵo(j) estu malinstalotaj:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Kelkaj pakaĵoj ne malinstaleblas"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1357,8 +1166,7 @@ msgstr ""
 "Malinstalo de tiuj pakaĵoj kolapsigus vian sistemon, bedaŭrinde:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1368,13 +1176,11 @@ msgstr ""
 "nun malelektataj:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Necesas kromaj pakaĵoj"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1384,18 +1190,17 @@ msgstr ""
 "esti instalitaj:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Kelkaj pakaĵoj ne instaleblas"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1405,123 +1210,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Kelkaj pakaĵoj devas esti malinstalotaj"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Elektita: %d MB / Libera diskospaco: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Elektita grandeco: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Sekurecaj ĝisdatigoj"
+#: ../rpmdrake:1003
+msgid "Installed"
+msgstr "Instalitaj"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Cimo-riparaj ĝisdatigoj"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normalaj ĝisdatigoj"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Ne instalu"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linuks-elektoj"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Ĉiuj pakaĵoj, laŭ alfabeto"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Ĉiuj pakaĵoj, laŭgrupe"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Ĉiuj pakaĵoj, laŭ ebleco de ĝisdatigo"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Ĉiuj pakaĵoj, laŭ grandeco"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Ĉiuj pakaĵoj, laŭ stato de elekto"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Ĉiuj pakaĵoj, laŭ portil-deponejo"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Ĉiuj pakaĵoj, laŭ ebleco de ĝisdatigo"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Nur forlasas, vicigita de instalo-dato"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Ĉiuj pakaĵoj, laŭgrupe"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normalaj ĝisdatigoj"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Cimo-riparaj ĝisdatigoj"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normalaj ĝisdatigoj"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Sekurecaj ĝisdatigoj"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "en nomoj"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "en priskriboj"
 
-#: ../rpmdrake:1061
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "en dosieroj"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normalaj informoj"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maksimuma informo"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Vi devas unue elekti kelkajn pakaĵojn."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Tro multaj pakaĵoj elektitaj"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1538,7 +1328,7 @@ msgstr ""
 "Ĉu vi vere deziras instali ĉiujn elektitajn pakaĵojn?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1552,89 +1342,103 @@ msgstr ""
 "\n"
 "Ĉu vi deziras daŭrigi?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Dosiero"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Ĝisdatigu datenportilon"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Reŝargu la elekton"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Reŝargu la liston de _pakaĵoj"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Finu"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Opcioj"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Montru aŭtomate elektitajn pakaĵojn"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Helpo"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+#, fuzzy
+msgid "/_About..."
+msgstr "/Helpo/_Pri..."
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux-Ĝisdatigo (Mandriva Linux Update)"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Trovu:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Serĉu"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Forviŝu"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instalu"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Forlasu"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Fatala eraro"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Okazis fatala eraro: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1646,13 +1450,12 @@ msgstr ""
 "\n"
 "Ĉu mi nun daŭrigu?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Jam ekzistas ĝisdatiga portilo"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1669,13 +1472,12 @@ msgstr ""
 "\n"
 "Poste, restartigu Mandriva-Ĝisdatigilon (%s)."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Kiel mane elekti vian spegulon"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1689,58 +1491,56 @@ msgstr ""
 "\n"
 "Poste, restartigu MandrivaĜisdatigo-n (%s)."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Bonvole atendu, mi serĉas haveblajn pakaĵojn..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Bonvole atendu, mi legas la datenbazon de pakaĵoj..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Inspektante %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "ŝanĝo:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Malinstalu .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Uzu %s kiel ĉefan dosieron"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Faru nenion"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalo finita"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Inspektado..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Ĉiuj deziritaj pakaĵoj estas sukcese instalitaj."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problemo okazis dum instalado"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1750,18 +1550,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Mi ne povas akiri fontpakaĵojn."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Mi ne povas akiri fontpakaĵojn, bedaŭre. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1773,38 +1572,34 @@ msgstr ""
 "Eraro(j) raportita(j):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalado de pakaĵoj..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicanta..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalado de pakaĵoj..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Ŝanĝu portilon"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Bonvolu enmeti la portilon nomitan\"%s\" en la legilon [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Deŝutante pakaĵon '%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Kontrolante signaturojn de pakaĵoj..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1818,13 +1613,12 @@ msgstr ""
 "\n"
 "Ĉu vi deziras tamen daŭrigi la instaladon?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalado malsukcesis"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1835,23 +1629,22 @@ msgstr ""
 "%s\n"
 "Eble ĝisdatigu vian portil-datenbazon."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Preparas instaldon de pakaĵoj..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalante pakaĵon `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne povis atingi rpm-an dosieron [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1863,43 +1656,33 @@ msgstr ""
 "Kelkaj konfigur-dosieroj kreiĝis kiel 'rpmnew' aŭ 'rpmsave',\n"
 "vi povas nun enrigardi kelkajn por ekagi:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Kromaj informoj pri pakaĵo... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Neniu pakaĵo trovita por instalado."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Neriparebla eraro: nenia pakaĵo por instalo trovita, bedaŭre."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Bonvole atendu, mi legas la datenbazon de pakaĵoj..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Bonvole atendu, mi malinstalas pakaĵojn..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problemo okazis dum malinstalado"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1909,8 +1692,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1922,8 +1704,8 @@ msgstr ""
 "Tiu ĉi ilo helpos vin elekti kiun programon vi deziras malinstali de\n"
 "via komputilo."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1935,13 +1717,11 @@ msgstr ""
 "Tiu ĉi ilo helpos vin elekti la ĝisdatigojn kiujn vi deziras instali en\n"
 "vian komputilon."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1955,214 +1735,177 @@ msgstr ""
 "sur KDRomo aŭ DVD. Tiu ĉi ilo helpos vin elekti kiujn programojn\n"
 "vi deziras instali en via komputilo."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Malinstalilo por program-pakaĵoj"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux-Ĝisdatigo (Mandriva Linux Update)"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Malinstalilo por program-pakaĵoj"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Bonvole tajpu vian pasfrazon por %s@%s::"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Salutnomo:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Malinstalilo por program-pakaĵoj"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Malinstalilo por program-pakaĵoj"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalado de program-pakaĵoj..."
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Jes"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informoj..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Aŭstrio"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australio"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazilo"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanado"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Svislando"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Kostariko"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "la Ĉeĥa Respubliko"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Germanio"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danio"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grekio"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Hispanujo"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finnlando"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Francio"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hungario"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israelo"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italio"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japanio"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Koreio"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Nederlando"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvegio"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Pollando"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugalio"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusio"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Svedio"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapuro"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakujo"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Tajvano"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Unuiĝinta Regno"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Ĉinio"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Usono"
 
-#: ../rpmdrake.pm:505
-#, fuzzy, c-format
+#: ../rpmdrake.pm:518
+#, fuzzy
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2174,8 +1917,7 @@ msgstr ""
 "\n"
 "Ĉu mi nun daŭrigu?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2187,23 +1929,25 @@ msgstr ""
 "\n"
 "Ĉu mi nun daŭrigu?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Bonvole atendu, mi deŝutas speguladresojn."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Bonvole atendu, mi deŝutas speguladresojn de la retpaĝo de Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Eraro dum deŝutado"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2217,8 +1961,8 @@ msgstr ""
 "La reto, aŭ la retpaĝo, eble ne atingeblas.\n"
 "Bonvolu reprovi poste."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2232,18 +1976,15 @@ msgstr ""
 "La reto, aŭ la retpaĝo de Mandriva, eble ne atingeblas.\n"
 "Bonvolu reprovi poste."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nenia spegulo"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2257,69 +1998,64 @@ msgstr ""
 "la kazo kiam la arkitekturo de via procezilo ne estas subtenata\n"
 "de Oficialaj Ĝisdatigoj de Mandriva-Linukso."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Bonvole elektu la deziratan spegulon."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiante dosieron por la datenportilo '%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Kontrolante la dosieron de portilo '%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Kontrolante foran dosieron de portilo '%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " farita."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " malsukcesis!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Startigas deŝuton de '%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Deŝuto de '%s', tempo por fari:%s, rapideco:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Deŝuto de `%s', rapideco:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Bonvole atendu, mi ĝisdatigas..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2329,34 +2065,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Ĝisdatigu datenportilon"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Bonvole elektu la datenportilon kiun vi deziras ĝisdatigi:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Elektu ĉiujn"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Ĝisdatigu"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2368,26 +2099,25 @@ msgstr ""
 "Eraroj:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Ne povis krei datenportilon."
 
-#: ../rpmdrake.pm:819
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "Bonvole atendu, mi aldonas portilon..."
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2397,29 +2127,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Helpo lanĉita fone"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "La helpfenestro estas lanĉita, ĝi aperos tuj sur via ekrano."
@@ -2695,6 +2423,21 @@ msgstr "Malinstalu programo(j)n"
 msgid "Software Media Manager"
 msgstr "Programfont-mastrumilo"
 
+#~ msgid "Stop"
+#~ msgstr "Haltu"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Ĉiuj pakaĵoj, laŭ portil-deponejo"
+
+#~ msgid "Normal information"
+#~ msgstr "Normalaj informoj"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maksimuma informo"
+
+#~ msgid "Install"
+#~ msgstr "Instalu"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "ĉio estis ĝuste instalita"
 
@@ -2763,9 +2506,6 @@ msgstr "Programfont-mastrumilo"
 #~ "La pakaĵo %s havas malĝustan subskribon aŭ\n"
 #~ "GnuPG estis malĝuste instalata"
 
-#~ msgid "Don't install"
-#~ msgstr "Ne instalu"
-
 #~ msgid "Signature problem"
 #~ msgstr "Problemo pri subskribo"
 
@@ -2922,12 +2662,6 @@ msgstr "Programfont-mastrumilo"
 #~ msgid "/File/_Quit"
 #~ msgstr "/Dosiero/_Ĉesu"
 
-#~ msgid "/Help/_About..."
-#~ msgstr "/Helpo/_Pri..."
-
-#~ msgid "Installed"
-#~ msgstr "Instalitaj"
-
 #~ msgid "Mandrakeupdate, version 7.2\n"
 #~ msgstr "Mandrakeupdate, versio 7.2\n"
 
diff --git a/po/es.po b/po/es.po
index 52507f40..12072b44 100644
--- a/po/es.po
+++ b/po/es.po
@@ -19,7 +19,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-es\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-05-11 08:44+0200\n"
 "Last-Translator: José Manuel Pérez <jmprodu@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -29,13 +30,11 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Seleccione el tipo de soporte"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -60,18 +59,16 @@ msgstr ""
 "pero\n"
 "deberá hacerlo en dos pasos.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Fuentes de la distribución"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Actualizaciones oficiales"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -89,104 +86,85 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Por favor espere, agregando soportes..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Agregar un soporte"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Archivos locales"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Ruta:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "Servidor FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Servidor HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Dispositivo extraíble"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Ruta o punto de montaje:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Dispositivo extraíble"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Examinar..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Cuenta:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Ruta relativa de synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Si se deja vacío, se buscará automáticamente synthesis/hdlist"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nombre:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Crear soporte para una distribucion completa"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Buscar actualizaciones en este soporte"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Debe completar al menos las dos primeras entradas."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -194,13 +172,11 @@ msgstr ""
 "Ya hay un soporte con ese nombre, ¿realmente\n"
 "desea reemplazarlo?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Agregando un soporte:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tipo de soporte:"
 
@@ -208,10 +184,9 @@ msgstr "Tipo de soporte:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -220,101 +195,86 @@ msgstr "Cancelar"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Aceptar"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Opciones globales para la instalación de paquetes"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "siempre"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nunca"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifique los paquetes a instalar:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Programa de descarga a usar:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Quitar una fuente"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "¿Está seguro que desea quitar la fuente «%s»?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Por favor espere, quitando soporte..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Editar un soporte"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Editando soporte «%s»:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Necesita insertar el soporte para continuar"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Para guardar los cambios, necesita insertar el soporte en la unidad."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Configurar proxies"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Ajustes de proxy para soporte «%s»"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Ajustes globales de proxy"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -323,168 +283,139 @@ msgstr ""
 "(sintaxis: <hostproxy[:puerto]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Nombre de host del proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, 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:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Usuario:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Añadir un grupo paralelo"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Editar un grupo paralelo"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Agregar un límite de soportes"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Elija un soporte para añadir al límite de soportes:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Agregar un host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Ingrese el nombre del host o la dirección IP del host a añadir:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editando grupo paralelo «%s»:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nombre del grupo:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocolo:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Límite de soportes:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Agregar"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Quitar"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Hosts:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configurar urpmi paralelo (ejecución distribuída de urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grupo"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Límite de soportes"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocolo"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Comando"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Editar..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Agregar..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Administrar claves para las firmas digitales de los paquetes"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Soporte"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Claves"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 "no se encontró nombre, ¡la clave no existe en el anillo de claves de rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Añadir una clave"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Elija una clave para añadir al soporte %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Quitar una clave"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -493,37 +424,31 @@ msgstr ""
 "(nombre de la clave: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Agregar una clave"
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Quitar clave"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Configurar soportes"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "¿Habilitada?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "¿Actualizaciones?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -533,38 +458,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Agregar personalizado..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Actualizar..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Administrar claves..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralelo..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Opciones globales..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -574,8 +493,7 @@ msgstr ""
 "\n"
 "¿Desea continuar? "
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -589,8 +507,7 @@ msgstr ""
 "utilizar en su computadora. Luego, los mismos estarán disponibles para\n"
 "instalar paquetes de software nuevos o realizar actualizaciones."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -602,13 +519,23 @@ msgstr ""
 "administrador de soportes en otro escritorio, o está instalando\n"
 "paquetes en este instante?)"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "No se puede añadir un soporte, faltan argumentos o son erróneos"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Está a punto de añadir un soporte de paquetes nuevo, `%s'.\n"
+"Esto significa que podrá añadir paquetes de software nuevos\n"
+"a su sistema desde dicho soporte nuevo."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -618,18 +545,22 @@ msgstr ""
 "Esto significa que podrá añadir paquetes de software nuevos\n"
 "a su sistema desde dicho soporte nuevo."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Soporte `%s' añadido satisfactoriamente."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Soporte `%s' añadido satisfactoriamente."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Uso: %s [OPCIÓN]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -637,44 +568,37 @@ msgstr ""
 "  --changelog-first      muestra el archivo de registro de cambios antes de "
 "la lista de los archivos en la ventana de descripción"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     limitarse al soporte elegido"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     propone combinar todos los archivos.rpmnew/.rpmsave "
 "encontrados"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            establecer modo (instalar (por defecto), eliminar, "
 "actualizar)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      no pedir confirmación en modo actualización"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      no actualizar el soporte al comienzo"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        no verificar las firmas de los paquetes"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -682,33 +606,27 @@ msgstr ""
 "  --parallel=alias,host  pasar en modo paralelo, usar el grupo «alias», usar "
 "la máquina «host» para resolver las dependencias"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    mostrar sólo estos paquetes"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      preseleccionar estos paquetes"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 forzar la ejecución como root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           ejecutar búsqueda de «pkg»"
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Ejecutando en modo usuario"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -718,634 +636,517 @@ msgstr ""
 "No podrá realizar modificaciones en el sistema,\n"
 "pero puede navegar por la base de datos de paquetes."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Accesibilidad"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archivado"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Copia de respaldo"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Grabación de CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compresión"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Otro"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Libros"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Libros de computación"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "COMOs"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Clúster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Paso de mensajes"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Servicios de cola"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Comunicaciones"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Desarrollo"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Desarrollo"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME y GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE y QT"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Núcleo"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editores"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Educación"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emuladores"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Herramientas de archivo"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Juegos"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Aventura"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Juegos"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Tableros"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Naipes"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Rompecabezas"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Deportes"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Estrategia"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Entorno gráfico"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Entorno gráfico"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Basado en FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitoreo"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Red"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Red"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transferencia de archivos"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Mensajería instantánea"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Correo"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Noticias"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Acceso remoto"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ofimática"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Claves Públicas"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Edición"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Ciencias"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomía"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Ciencias"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biología"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Química"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Ciencias de la computación"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geociencias"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matemáticas"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Física"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Sistema"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Configuración"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Sistema"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Arranque e Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configuración"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Empaquetado"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Impresión"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Despliegue"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Despliegue"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Tipografías"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Consola"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Tipografías"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalización"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Núcleo y hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Bibliotecas"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servidores"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminales"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Herramientas de texto"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Juguetes"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(No disponible)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Resultados de la búsqueda"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Resultados de la búsqueda (ninguno)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Por favor espere, buscando ..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Detener"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Agregable"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Actualizable"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Agregable"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "No seleccionado"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "No seleccionado"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importancia: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Razón para actualizar: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Sin descripción"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Archivos:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Cambios:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Soporte: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versión actualmente instalada: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versión: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arquitectura: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Tamaño: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Importancia: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Tamaño: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Resumen: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Razón para actualizar: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Descripción: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Sin descripción"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Más información sobre el paquete..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Por favor, elija"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Se necesita uno de los paquetes siguientes:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Por favor, elija"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Por favor espere, listando paquetes..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Sin actualizaciones"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1355,29 +1156,24 @@ msgstr ""
 "actualizaciones disponibles para los paquetes instalados en su computadora,\n"
 "o bien ya los instaló todos."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Todo"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Más información"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Información sobre paquetes"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Se necesitan quitar algunos paquetes adicionales"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1387,13 +1183,11 @@ msgstr ""
 "siguientes:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "No se pueden quitar algunos paquetes"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1401,8 +1195,7 @@ msgstr ""
 "Eliminar estos paquetes podría estropear su sistema, lo siento:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1412,13 +1205,11 @@ msgstr ""
 "paquetes siguientes:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Se necesitan paquetes adicionales"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1428,18 +1219,17 @@ msgstr ""
 "paquetes siguientes:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (es parte de la lista de omisión)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Algunos paquetes no se pueden instalar"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1449,123 +1239,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Se necesita quitar algunos paquetes"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Tamaño seleccionado: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Descripción no disponible para este paquete\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Actualizaciones de seguridad"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizaciones que corrigen bugs"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instalar"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Actualizaciones normales"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instalar"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "Selecciones de %s"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Selecciones de Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Todos los paquetes, alfabético"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Todos los paquetes, por grupo"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Todos los paquetes, por disponibilidad de actualización"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Todos los paquetes, por tamaño"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Todos los paquetes, por estado de la selección"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Todos los paquetes, por repositorio de soporte"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Todos los paquetes, por disponibilidad de actualización"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Sólo hojas, clasificadas por fecha de instalación"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Todos los paquetes, por grupo"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Actualizaciones normales"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Actualizaciones que corrigen bugs"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Actualizaciones normales"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Actualizaciones de seguridad"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "en nombres"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "en descripciones"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "en nombres de archivo"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Información normal"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Información máxima"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Primero debe seleccionar algunos paquetes."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Se han seleccionado demasiados paquetes."
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1583,7 +1358,7 @@ msgstr ""
 "¿Realmente quiere instalar los paquetes seleccionados?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1597,89 +1372,100 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Actualizar soportes"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Reiniciar la selección"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Recargar la lista de _paquetes"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Salir"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>S"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Opciones"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Mostrar los paquetes seleccionados automáticamente"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/A_yuda"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Actualización de Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Encontrar:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Buscar"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Limpiar"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instalar"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Salir"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Ocurrió un error fatal: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1692,13 +1478,12 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Soporte de actualizaciones ya existente"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1714,13 +1499,12 @@ msgstr ""
 "\n"
 "Luego, vuelva a iniciar %s. "
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Cómo elegir manualmente su sitio de réplica"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1734,58 +1518,56 @@ msgstr ""
 "\n"
 "Luego, vuelva a iniciar %s. "
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Por favor espere, encontrando los paquetes disponibles..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Por favor espere, leyendo la base de datos de paquetes..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Inspeccionando %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "cambios:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Quitar .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Usar .%s como archivo principal"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "No hacer nada"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Finalizó la instalación"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Inspeccionar..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problema durante la instalación"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1795,18 +1577,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "No se pueden obtener los paquetes de la fuente."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "No se pueden obtener paquetes fuente, lo siento. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1818,38 +1599,34 @@ msgstr ""
 "Error(es) reportado(s):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalación de paquete..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicializando..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalación de paquete..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Cambiar el soporte"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor inserte el soporte denominado «%s» en el dispositivo [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Descargando el paquete «%s» (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Verificando las firmas de los paquetes..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1863,13 +1640,12 @@ msgstr ""
 "\n"
 "¿Desea continuar con la instalación?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1881,23 +1657,22 @@ msgstr ""
 "\n"
 "Puede que desee actualizar la base de datos de sus soportes."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Preparando instalación de paquetes..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando el paquete «%s» (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "no se puede acceder al archivo rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1909,43 +1684,33 @@ msgstr ""
 "Algunos archivos de configuración se crearon como `.rpmnew' o `.rpmsave',\n"
 "ahora puede inspeccionar algunos para poder tomar acción:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Estos paquetes contienen información de actualización"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Más información sobre el paquete... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "No se encontró paquete para instalar."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Error no recuperable: no se encontró paquete para instalar, lo siento."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Por favor espere, leyendo la base de datos de paquetes..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Por favor espere, quitando paquetes..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problema durante la eliminación"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1955,8 +1720,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1968,8 +1732,8 @@ msgstr ""
 "Esta herramienta le ayudará a elegir el software que desea quitar de su "
 "computadora."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1981,13 +1745,11 @@ msgstr ""
 "Esta herramienta le ayudará a elegir las actualizaciones que desea instalar\n"
 "en su computadora."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "¡Bienvenido a la herramienta de instalación de software!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -2001,214 +1763,172 @@ msgstr ""
 "CDROM o DVD. Esta herramienta le ayudará a elegir el software que desea\n"
 "instalar en su computadora."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Actualización de software"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Actualización de Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Actualización de software"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Por favor, ingrese sus credenciales para acceder al proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Nombre de usuario:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Quitar paquetes de software"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Actualización de paquetes de software"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalación de paquetes de software"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Sí"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Suiza"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Alemania"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "España"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Francia"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hungría"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japón"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Países Bajos"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2220,8 +1940,7 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2233,26 +1952,29 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "Selecciones de %s"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Por favor espere, descargando las direcciones de los sitios de réplica."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Por favor espere, descargando las direcciones de los sitios de réplica desde "
 "el sitio web de Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Error durante la descarga"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2266,8 +1988,8 @@ msgstr ""
 "Tal vez no está disponible la red, o el sitio web.\n"
 "Por favor, inténte nuevamente más tarde."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2281,18 +2003,15 @@ msgstr ""
 "Tal vez la red, o el sitio web de Mandriva, no está disponible.\n"
 "Por favor, inténtelo nuevamente más tarde."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Sin sitio de réplica"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "No puedo encontrar un sitio de réplica adecuado."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2306,69 +2025,64 @@ msgstr ""
 "arquitectura de su procesador no está soportada por las Actualizaciones\n"
 "Oficiales de Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Por favor, elija el sitio de réplica deseado."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copiando archivo para soporte `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinando archivo de soporte `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinando archivo remoto de soporte `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " hecho."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " ¡falló!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s de soporte %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Comenzando descarga de «%s»..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Descarga de `%s', faltan:%s, velocidad:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Descarga de `%s', velocidad:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Por favor espere, actualizando soportes..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Error recuperando paquetes"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2384,34 +2098,29 @@ msgstr ""
 "momento no se puede acceder al mismo y debería volver a intentarlo\n"
 "más tarde."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Actualizar soportes"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Seleccione los soportes que desea actualizar:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2423,8 +2132,8 @@ msgstr ""
 "Errores:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2434,18 +2143,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "No se puede crear el soporte."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Fallo al añadir soporte"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2455,8 +2162,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2466,8 +2173,8 @@ msgstr ""
 "de %s que está corriendo (%s).\n"
 "Será deshabilitado."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2477,13 +2184,11 @@ msgstr ""
 "de Mandriva Linux que está corriendo (%s).\n"
 "Será deshabilitado."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Ayuda lanzada en segundo plano"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2760,6 +2465,18 @@ msgstr "Quitar software"
 msgid "Software Media Manager"
 msgstr "Administrador de soportes de software"
 
+#~ msgid "Stop"
+#~ msgstr "Detener"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Todos los paquetes, por repositorio de soporte"
+
+#~ msgid "Normal information"
+#~ msgstr "Información normal"
+
+#~ msgid "Maximum information"
+#~ msgstr "Información máxima"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "se instaló todo correctamente"
 
diff --git a/po/et.po b/po/et.po
index 3d9a13a4..8945307d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2006-03-05 13:59+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,13 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Andmekandja tüübi valimine"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -45,18 +44,16 @@ msgstr ""
 "kui ka allikaid, mis pakuvad Teie distributsioonile ametlikke uuendusi.\n"
 "(Teil on võimalik lisada ka mõlemad, kuid seda tuleb teha eraldi sammudena.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Distributsiooniallikad"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Ametlikud uuendused"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -74,104 +71,84 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Palun oodake, lisatakse andmekandja..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Allika lisamine"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Kohalikud failid"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Otsingutee:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "RSYNC-server"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP-server"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Eemaldatav seade"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Otsingutee või haakepunkt:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Eemaldatav seade"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Sirvi..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Kasutajatunnus:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Suhteline tee sünteesi/hdlist faili juurde:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Tühjaksjätmisel püütakse automaatselt kasutada sünteesi/hdlisti"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nimi:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Andmekandja loomine kogu distributsioonile"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Uuenduste otsimine sellelt andmekandjalt"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Täitke vähemalt 2 esimest välja."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -179,13 +156,11 @@ msgstr ""
 "Sellise nimega andmekandja on juba olemas,\n"
 "kas soovite tõesti selle asendada?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Allika lisamine:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Andmekandja tüüp:"
 
@@ -193,10 +168,9 @@ msgstr "Andmekandja tüüp:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Loobu"
 
@@ -205,101 +179,86 @@ msgstr "Loobu"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Olgu"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Paigaldamise globaalsed valikud"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "alati"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "mitte kunagi"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Paigaldatavate RPM-pakettide kontroll:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Kasutatav allalaadimisprogramm:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Allika eemaldamine"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Kas tõesti eemaldada allikas \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Palun oodake, eemaldan andmekandja..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Allika muutmine"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Allika \"%s\" muutmine:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Salvesta muutused"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Puhverserver..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Jätkamiseks tuleb sisestada andmekandja"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Muutuste salvestamiseks tuleb andmekandja seadmesse sisestada."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Puhverserveri seadistamine"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Andmekandja \"%s\" puhverserveri seadistused"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globaalsed puhverserveri seadistused"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -308,167 +267,138 @@ msgstr ""
 "(süntaks: <puhverserver[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Puhverserveri masinanimi:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Puhverserveri autentimiseks oleks tulus määrata kasutajanimi ja parool:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Kasutajanimi:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Paralleelgrupi lisamine"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Paralleelgrupi muutmine"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Andmekandja limiidi lisamine"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Valige andmekandja andmekandjate limiiti lisamiseks:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Serveri lisamine"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Kirjutage lisatava serveri masinanimi või IP-aadress:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Paralleelgrupi \"%s\" muutmine:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Grupi nimi:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Andmekandja limiit:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Lisa"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Eemalda"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Serverid:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Paralleel-uprmi seadistamine (urpmi jagatud käivitamine)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grupp"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Andmekandjate limiit"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokoll"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Käsk"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(puudub)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Muuda..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Lisa..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Pakettide digitaalsignatuuride võtmete haldamine"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Andmekandja"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Võtmed"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "nime ei leitud, võtit ei ole rpm-i võtmerõngas!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Võtme lisamine"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Võtme valimine andmekandjale %s lisamiseks"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Võtme eemaldamine"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -477,37 +407,31 @@ msgstr ""
 "(võtme nimi: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Lisa võti..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Eemalda võti"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Allikate seadistamine"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Kas lubada?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Uuendused?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Seda andmekandjat tuleb kasutamiseks uuendada. Kas teha seda kohe?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -517,38 +441,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Lisa omaloodud..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Uuenda..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Võtmete haldamine"
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralleel..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Globaalsed valikud..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Abi"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -558,8 +476,7 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -573,8 +490,7 @@ msgstr ""
 "kasutada oma süsteemi uuendamisel. Kui olete allikad määranud, saate\n"
 "nende abil paigaldada uusi tarkvarapakette või uuendada vanu."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -586,13 +502,23 @@ msgstr ""
 "andmekandjatega tegelev rakendus mõnel muul töölaual või\n"
 "paigaldate parajasti mingeid tarkvarapakette?)"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Andmekandja lisamine ebaõnnestus, argumendid olid vigased või puudu"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Kavatsete lisada uue tarkvaraallika '%s'.\n"
+"See tähendab, et eduka lisamise korral saate hakata\n"
+"süsteemi uut tarkvara paigaldama."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -602,18 +528,22 @@ msgstr ""
 "See tähendab, et eduka lisamise korral saate hakata\n"
 "süsteemi uut tarkvara paigaldama."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Andmekandja '%s' edukalt lisatud."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Andmekandja '%s' edukalt lisatud."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Kasutamine: %s [VÕTI]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -621,45 +551,38 @@ msgstr ""
 "  --changelog-first      muutuste logi näidatakse kirjeldusaknas enne "
 "failide nimekirja"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     piirdumine määratud andmekandjaga"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     kõigi leitud .rpmnew/.rpmsave-failide ühendamine"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            režiimi määramine (paigaldamine (vaikimisi), "
 "eemaldamine, uuendamine)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      uuendamisrežiimis ei esitata esimest "
 "kinnituseküsimust"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      käivitamisel ei uuendata andmekandjat"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        pakettide signatuure ei kontrollita"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -667,33 +590,27 @@ msgstr ""
 "  --parallel=alias,host  töö paralleelrežiimis, kasutades gruppi \"alias\", "
 "kasutades masinat \"host\" vajalike sõltuvuste näitamiseks"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    näidatakse ainult määratud pakette"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      määratud pakettide eelvalimine"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 sunnitakse töötama administraatori õigustes"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           otsitakse paketti \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Töötamine kasutaja õigustega"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -703,634 +620,517 @@ msgstr ""
 "Te ei saa nii küll süsteemis mingeid muutusi ette võtta,\n"
 "kuid võite siiski sirvida olemasolevat andmebaasi."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Hõlbustus"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arhiveerimine"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Varundamine"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD-de kirjutamine"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Tihendamine"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Muu"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Raamatud"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Arvutiraamatud"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "KKK"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "HOWTO"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Kirjandus"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Klaster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Teateedastus"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Järjekorrateenused"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Kommunikatsioon"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Andmebaasid"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Arendus"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Arendus"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME ja GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE ja Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Redaktorid"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Haridus"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulaatorid"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Failitööriistad"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Mängud"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Seiklusmängud"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Mängud"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Võitlusmängud"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Lauamängud"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kaardimängud"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Pusled"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strateegia"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Graafiline töölaud"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Graafiline töölaud"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "IceWM"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Graafika"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitooring"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimeedia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Võrk"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Võrk"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Failiedastus"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Kiirsuhtlus"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "E-post"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Uudised"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Kaugligipääs"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Kontoritöö"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Avalikud võtmed"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publitseerimine"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Teadus"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronoomia"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Teadus"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Bioloogia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Keemia"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Arvutiteadus"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geograafia"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matemaatika"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Füüsika"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shellid"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Heli"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Süsteem"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Baas"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Seadistamine"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Süsteem"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Algkäivitus"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Seadistamine"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Paketindus"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Trükkimine"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Jaosvõrk"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Jaosvõrk"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fondid"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsool"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Fondid"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internatsionaliseerimine"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel ja riistvara"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Teegid"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Serverid"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminalid"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Tekstitööriistad"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Mänguasjad"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(kättesaamatu)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Otsingu tulemused"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Otsingu tulemus (ei leitud)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Palun oodake, otsitakse..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Peata"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Lisatavad"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Uuendatavad"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Lisatavad"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Valimata"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Valitud"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Valimata"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Tähtsus: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Uuendamise põhjus: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Kirjeldus puudub"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Failid:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Muutuste logi:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Andmekandja: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Praegu paigaldatud versioon: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nimi: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versioon: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arhitektuur: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Suurus: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Tähtsus: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Suurus: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Kokkuvõte: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Uuendamise põhjus: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Kirjeldus: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Kirjeldus puudub"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Rohkem infot paketi kohta..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Palun valige"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgmistest pakettidest:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Palun valige"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Palun oodake, koostatakse nimekirja..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Uuendusi ei ole"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1340,29 +1140,24 @@ msgstr ""
 "paigaldatud pakettidele ei ole parajasti mingeid uuendusi või\n"
 "Te olete need juba kõik paigaldanud."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Kõik"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Rohkem infot"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Info pakettide kohta"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1371,13 +1166,11 @@ msgstr ""
 "Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Mõnda paketti ei saa eemaldada"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1385,8 +1178,7 @@ msgstr ""
 "Vabandust, nende pakettide eemaldamine võib halvata Teie süsteemi:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1395,13 +1187,11 @@ msgstr ""
 "Sõltuvuste tõttu ei saa järgmisi pakette valida:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Vajalikud lisapaketid"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1410,18 +1200,17 @@ msgstr ""
 "Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (kuulub vahelejäetavate hulka)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Mõnda paketti ei saa paigaldada"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1431,123 +1220,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Mõned paketid tuleb eemaldada"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valitud: %d MB / Vaba kettaruumi %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Valitud pakettide maht: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Sellel paketil pole kirjeldust\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Turvaparandused"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Turvaparandused/uuendused"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Paigalda"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Uuendused"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Paigalda"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s valikud"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linuxi valikud"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Kõik paketid tähestikuliselt"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Kõik paketid grupi järgi"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Kõik paketid uuendamisstaatuse järgi"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Kõik paketid suuruse järgi"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Kõik paketid valikustaatuse järgi"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Kõik paketid andmekandja järgi"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Kõik paketid uuendamisstaatuse järgi"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Ainult sõltuvusteta paketid paigaldusaja järgi"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Kõik paketid grupi järgi"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Uuendused"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Turvaparandused/uuendused"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Uuendused"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Turvaparandused"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "nimedes"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "kirjeldustes"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "failinimedes"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Tavainfo"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Täielik info"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Kõigepealt tuleb mõned paketid valida."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Valitud on liiga palju pakette"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1564,7 +1338,7 @@ msgstr ""
 "Kas soovite tõesti paigaldada kõik valitud paketid?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1578,89 +1352,100 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Fail"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Uuenda allikaid"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Lähtesta valik"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Laadi _pakettide nimekiri uuesti"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Välju"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Seadistused"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/A_utomaatselt valitud pakettide näitamine"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linuxi uuendused"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Otsimine:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Otsi"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Puhasta"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Paigalda"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Välju"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Saatuslik viga"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Tekkis saatuslik viga: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1672,13 +1457,12 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Olemasolevad uuenduste allikad"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1694,13 +1478,12 @@ msgstr ""
 "\n"
 "Seejärel käivitage %s uuesti."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Kuidas valida peegel käsitsi"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1714,58 +1497,56 @@ msgstr ""
 "\n"
 "Seejärel taaskäivitage %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Palun oodake, otsitakse kättesaadavaid pakette..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Palun oodake, loetakse pakettide andmebaasi..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "%s uurimine"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "muutused:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Eemalda .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Kasuta .%s põhifailina"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ära tee midagi"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Paigaldus lõpetatud"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Uuri..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Kõik soovitud paketid said edukalt paigaldatud."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Paigaldusel tekkis probleem"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1775,18 +1556,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Pakette ei õnnestunud tõmmata."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Vabandust, pakette ei õnnestunud kätte saada. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1798,38 +1578,34 @@ msgstr ""
 "Anti teada vigadest:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Paigaldamine..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Initsialiseerimine..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Paigaldamine..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Muuda andmekandjat"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Palun sisestage andmekandja \"%s\" seadmesse [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Tõmban võrgust paketti '%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Signatuuride kontrollimine..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1843,13 +1619,12 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1861,23 +1636,21 @@ msgstr ""
 "\n"
 "Võib-olla tasuks uuendada allikate andmebaasi."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Paigaldamiseks valmistumine..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1889,43 +1662,33 @@ msgstr ""
 "Mõned seadistusfailid loodi kui '.rpmnew' või '.rpmsave'.\n"
 "Te võiksite neid nüüd uurida, et võtta ette järgmisi samme:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Neil pakettidel on uuendusinfo"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Rohkem infot paketi kohta... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Paigaldamiseks ei leitud ühtegi paketti."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Parandamatu viga: kahjuks ei leitud paigaldamiseks ühtegi paketti."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Palun oodake, loetakse pakettide andmebaasi..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Palun oodake, eemaldatakse pakette..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Probleem eemaldamisel"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1935,8 +1698,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1947,8 +1709,8 @@ msgstr ""
 "\n"
 "Selle tööriista abil saate valida eemaldatava tarkvara."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1959,13 +1721,11 @@ msgstr ""
 "\n"
 "Selle tööriista abil saate oma Mandriva Linuxit uuendada."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Tere tulemast kasutama tarkvara paigaldamise abivahendit!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1978,214 +1738,172 @@ msgstr ""
 "Mandriva Linuxi CD või DVD sisaldab tuhandeid tarkvarapakette.\n"
 "Selle tööriista abil saate valida, millised soovite oma arvutile paigaldada."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Tarkvara uuendamine"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linuxi uuendused"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Tarkvara uuendamine"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Palun sisestage oma andmed puhverserveri kasutamiseks\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Kasutajanimi:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Tarkvara eemaldamine"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Tarkvara uuendamine"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Tarkvara paigaldamine"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Ei"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Jah"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Austraalia"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Šveits"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Tšehhi Vabariik"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Taani"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Kreeka"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Hispaania"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Soome"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ungari"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Iisrael"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Itaalia"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Jaapan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norra"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Poola"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Venemaa"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Suurbritannia"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Hiina"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "USA"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2197,8 +1915,7 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2210,23 +1927,26 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s valikud"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Palun oodake, laetakse peeglite aadresse."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Palun oodake, laetakse peeglite aadresse Mandriva veebisaidilt."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Viga allalaadimisel"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2240,8 +1960,8 @@ msgstr ""
 "Võrk või veebilehekülg ei pruugi olla kättesaadav.\n"
 "Palun proovige varsti uuesti."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2255,18 +1975,15 @@ msgstr ""
 "Võrk või Mandriva veebilehekülg ei pruugi olla kättesaadav.\n"
 "Palun proovige varsti uuesti."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Peeglit ei leitud"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Ühtki kõlblikku peeglit ei leitud."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2279,69 +1996,64 @@ msgstr ""
 "Sellel võib olla mitu põhjust. Kõige tavalisem on see, et Mandriva Linuxi\n"
 "ametlikud uuendused ei toeta Teie protsessori arhitektuuri."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Palun valige peegel."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Faili kopeerimine allika `%s' jaoks..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Allikafaili `%s' uurimine..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Allikafaili `%s' uurimine..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " tehtud."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " ebaõnnestus!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s andmekandjalt %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "'%s' allalaadimise alustamine..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' allalaadimine, kiirus:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Palun oodake, uuendatakse andmekandjat..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Viga pakettide hankimisel"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2357,35 +2069,30 @@ msgstr ""
 "lihtsalt ajutiselt kättesaamatu, millisel juhul võiks hiljem\n"
 "uuesti proovida nimekirja hankida."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Allikate uuendamine"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Aktiivset andmekandjat ei leitud. Uuendamiseks tuleb andmekandja aktiveerida."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Valige allikad, mida soovite uuendada:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Vali kõik"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2397,8 +2104,8 @@ msgstr ""
 "Vead:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2408,18 +2115,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Andmekandja loomine ebaõnnestus."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Viga andmekandja lisamisel"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2429,8 +2134,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2440,8 +2145,8 @@ msgstr ""
 "versiooniga (%s).\n"
 "Seepärast seda ei kasutata."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2451,13 +2156,11 @@ msgstr ""
 "Mandriva Linuxi versiooniga (%s).\n"
 "Seepärast seda ei kasutata."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Abi käivitati taustal"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "Abiaken on käivitatud, see peaks kohe ilmuma töölaual nähtavale."
@@ -2732,6 +2435,18 @@ msgstr "Tarkvara eemaldamine"
 msgid "Software Media Manager"
 msgstr "Tarkvaraallikate haldur"
 
+#~ msgid "Stop"
+#~ msgstr "Peata"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Kõik paketid andmekandja järgi"
+
+#~ msgid "Normal information"
+#~ msgstr "Tavainfo"
+
+#~ msgid "Maximum information"
+#~ msgstr "Täielik info"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "kõik paigaldati edukalt"
 
diff --git a/po/eu.po b/po/eu.po
index 2870e899..3803bc33 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,7 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-eu\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-12-29 10:22+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -20,13 +21,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Aukeratu euskarri mota"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -50,18 +49,16 @@ msgstr ""
 "dituzten iturburuak. (Biak erantsi ditzakezu, baino bi urratsetan egin\n"
 "beharko duzu)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Banaketaren iturburuak"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Eguneraketa ofizialak"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -80,104 +77,84 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Itxoin mesedez, euskarria eransten..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Gehitu euskarria"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Fitxategi lokalak"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Bide-izena:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP zerbitzaria"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URLa:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "RSYNC zerbitzaria"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP zerbitzaria"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Gailu aldagarria"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Bide-izena edo muntatze-puntua:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Gailu aldagarria"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Arakatu..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "hdlist-en/laburpenaren bide-izen erlatiboa:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Hutsik utziz gero, synthesis/hdlist automatikoki bilatuko da"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Izena:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Sortu euskarria banaketa oso batentzako"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Miatu euskarri hau eguneraketa bila"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Gutxienez lehen bi sarrerak bete behar dituzu."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -185,13 +162,11 @@ msgstr ""
 "Izen hori duen euskarria badago lehendik. Ziur zaude\n"
 "ordeztu nahi duzula?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Gehitu euskarria:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Euskarri-mota:"
 
@@ -199,10 +174,9 @@ msgstr "Euskarri-mota:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Utzi"
 
@@ -211,101 +185,86 @@ msgstr "Utzi"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Ados"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Pakete instalaketarako aukera orokorrak"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "beti"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "inoiz ez"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Egiaztatu instalatu beharreko RPMak:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Jaisteko erabili beharreko programa:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Iturburu Ezabaketa"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ziur zaude \"%s\" iturburua ezabatu nahi duzula?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Itxaron, euskarria kentzen ari da..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Editatu euskarri bat"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" euskarria editatzen:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Gorde aldaketak"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Proxy-a..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Jarraitu ahal izateko, euskarria sartu behar duzu"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Aldaketak gordetzeko, euskarria unitatean sartu behar duzu."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Konfiguratu proxiak"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxy ezarpenak \"%s\" euskarriarentzako"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Proxy ezarpen orokorrak"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -314,166 +273,137 @@ msgstr ""
 "<proxyostalaria[:ataka]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy-aren ostalari-izena:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Erabiltzailea/pasahitza zehatz dezakezu proxy-ren autentifikaziorako:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Erabiltzailea:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Gehitu talde paraleloa"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Editatu talde paraleloa"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Gehitu euskarriaren muga"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Hautatu euskarri bat euskarrien mugan gehitzeko:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Gehitu ostalari bat"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Idatzi gehitu beharreko ostalariaren ostalari-izena edo IP helbidea:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "\"%s\" talde paraleloa editatzen:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Taldearen izena:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokoloa:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Euskarrien muga:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Gehitu"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Kendu"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Ostalariak:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfiguratu urpmi paraleloa (urpmi-ren exekutatze banatua)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Elkartu"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokoloa"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Euskarrien muga"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokoloa"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Komandoa"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Editatu..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Gehitu..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Kudeatu paketeen sinadura digitalerako gakoak"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Tartekoa"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Gakoak"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "ez da izenik aurkitu, gako hori ez dago rpm gako-sortan!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Gehitu gakoa"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Hautatu %s euskarriari gehitu beharreko gakoa"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Kendu gako bat"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -482,39 +412,33 @@ msgstr ""
 "(gakoaren izena: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Gehitu gakoa..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Kendu giltza"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Konfiguratu euskarria"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Gaituta?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Eguneraketak?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Euskarri hau eguneratu beharrean dago erabilgarri izan dadin. Orain "
 "eguneratu?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -524,38 +448,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Erantsi pertsonalizatua..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Eguneratu..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Kudeatu gakoak..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paraleloa..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Aukera orokorrak.."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Laguntza"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -565,8 +483,7 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -581,8 +498,7 @@ msgstr ""
 "berriaren paketea instalatzeko\n"
 "edo eguneratzeak egiteko."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -594,13 +510,23 @@ msgstr ""
 "euskarri-kudeatzaile bat duzu, edo une honetan paketeak\n"
 "instalatzen ari zara?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Ezin da euskarririk gehitu, argumentuak falta dira edo okerrekoak dira"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Paketeen euskarri berri bat gehitzera zoaz, `%s'.\n"
+"Horrek esan nahi du software-pakete berriak euskarri berri\n"
+"horretatik gehitu ahal izango dituzula sisteman."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -610,18 +536,22 @@ msgstr ""
 "Horrek esan nahi du software-pakete berriak euskarri berri\n"
 "horretatik gehitu ahal izango dituzula sisteman."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "%s euskarria behar bezala gehitu da."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "%s euskarria behar bezala gehitu da."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Erabilera: %s [AUKERA]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -629,46 +559,39 @@ msgstr ""
 "  --changelog-first      erakutsi aldaketa erregistroa fitxategi zerrenda "
 "baino lehenago deskribapen leihoan"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     mugatu emaniko euskarrira"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     aurkitutako .rpmnew/.rpmsave fitxategi guztiak "
 "batzea proposatzen du"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            modua ezarri (instalatu (lehenetsia), ezabatu, "
 "eguneratu)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      ez galdetu lehenengo baieztapen galdera eguneraketa "
 "moduan"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      ez eguneratu euskarria hasterakoan"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        ez egiaztatu paketeen sinadurak"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -676,33 +599,27 @@ msgstr ""
 "  --parallel=goitizena,ostalaria  modu paraleloan izan, erabili \"goitizena"
 "\" taldea, erabili \"ostalaria\" makina beharrezko menpekotasunak erakusteko"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    soilik pakete hauek erakutsi"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      aurre-aukeratu pakete hauek"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 behartu root gisa exekutatzea"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           \"pkg\"-ren bilaketa exekutatu"
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Erabiltzaile-moduan ari da exekutatzen"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -712,634 +629,517 @@ msgstr ""
 "Ezingo duzu aldaketarik egin sisteman, \n"
 "baina uneko datu-basea arakatu ahal izango duzu."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Erabilerraztasuna"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Artxibatzen"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Babeskopia"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD grabaketa"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Konpresioa"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Bestelakoak"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Liburuak"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Informatikako liburuak"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "FAQ-ak"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "\"Nola\""
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Multzoa"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Mezu Pasea"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Ilara Zerbitzuak"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikazioak"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Datu-baseak"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Garapena"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Garapena"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME eta GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE eta Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Nukleoa"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editoreak"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Heziketa"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatzaileak"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Fitxategi-tresnak"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Jokoak"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Abentura"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Jokoak"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Makina-jokoak"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Mahai-jokoak"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kartak"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzzleak"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Kirolak"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Estrategia"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Mahaigain grafikoa"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Mahaigain grafikoa"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM oinarri du"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Irudiak"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Kontrolatzen"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Sarea"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Berriketa"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Sarea"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Fitxategi-transferentzia"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Berehalako mezularitza"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Posta"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Berriak"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Urruneko atzipena"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Bulegoa"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Gako Publikoak"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Argitalpena"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Zientziak"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Zientziak"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kimika"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informatika"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Lurraren zientziak"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fisika"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shell-ak"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Soinua"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Sistema"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Oinarria"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfigurazioa"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Sistema"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Abiarazi eta hasieratu"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigurazioa"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardwarea"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Paketatzea"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Inprimatzen"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Hedaketa"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Hedaketa"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Letra-tipoak"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Kontsola"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Letra-tipoak"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bit-mapa"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Nazioartekotzea"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Nukleoa eta hardwarea"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Liburutegiak"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Zerbitzariak"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminalak"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Testu-tresnak"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Jostagarriak"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Bideoa"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Ez dago erabilgarri)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Bilaketaren emaitzak"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Bilaketaren emaitzak (bat ere ez)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Itxaron, bilatzen ari da..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Gelditu"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Gehi daitekeena"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Berritu daitekeena"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Gehi daitekeena"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Ez dago hautatuta"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Hautatuta"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Ez dago hautatuta"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Garrantzia: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Eguneratzeko arrazoia: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Azalpenik ez"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fitxategiak:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Euskarria: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Unean instalatutako bertsioa: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Bertsioa: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arkitektura: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Tamaina: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Garrantzia: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Tamaina: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Laburpena: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Eguneratzeko arrazoia: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Azalpena: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Azalpenik ez"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Paketeari buruzko informazio gehiago..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Aukeratu"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Ondoko paketeetako bat behar da:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Aukeratu"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Itxaron, paketeen zerrenda egiten ari da..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Eguneratzerik ez"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1350,29 +1150,24 @@ msgstr ""
 "paketeetarako ez duzula eguneratzerik erabilgarri, \n"
 "edo lehendik guztiak instalatuta dituzula."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Denak"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Informazio gehiago"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Paketeei buruzko informazioa"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Pakete osagarri batzuk ere kendu egin behar dira"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1381,13 +1176,11 @@ msgstr ""
 "Mendekotasunak direla eta, pakete hauek ere kendu egin behar dira:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Pakete batzuk ezin dira kendu"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1395,8 +1188,7 @@ msgstr ""
 "Pakete hauek kentzen badituzu, zure sistema hondatu egin liteke:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1405,13 +1197,11 @@ msgstr ""
 "Mendekotasunak direla eta, pakete hauek ezin dira hautatu orain:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Pakete osagarriak behar dira"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1421,18 +1211,17 @@ msgstr ""
 "egin behar dira:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (alde batera utzitakoen zerrendari dagokio)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Pakete batzuk ezin dira instalatu"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1442,123 +1231,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Pakete batzuk kendu egin behar dira"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Hautatuta: %d MB / Leku librea diskoan: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Hautatutako tamaina: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Deskribapena ez dago eskuragarri pakete honentzako\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Segurtasunaren eguneratzeak"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Akats-konponketen eguneratzeak"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instalatu"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Eguneratze arruntak"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instalatu"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s aukera"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-en aukerak"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Pakete guztiak, alfabetikoki"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Pakete guztiak, taldearen arabera"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Pakete guztiak, eguneratzeen erabilgarritasunaren arabera"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Pakete guztiak, tamainaren arabera"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Pakete guztiak, hautapen-egoeraren arabera"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Pakete guztiak, euskarri-biltegiaren arabera"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Pakete guztiak, eguneratzeen erabilgarritasunaren arabera"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Hostoak bakarrik, instalatze-dataren arabera sailkatuta"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Pakete guztiak, taldearen arabera"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Eguneratze arruntak"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Akats-konponketen eguneratzeak"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Eguneratze arruntak"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Segurtasunaren eguneratzeak"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "izenetan"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "azalpenetan"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "fitxategi-izenetan"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informazio normala"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Gehienezko informazioa"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Lehenik pakete batzuk hautatu behar dituzu."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Pakete gehiegi hautatu dira"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1575,7 +1349,7 @@ msgstr ""
 "Ziur zaude hautatutako pakete guztiak instalatu nahi dituzula?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1589,89 +1363,100 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Fitxategia"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/Euskarria _Eguneratu"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/Aukeraketa _berrezarri"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Paketeen zerrenda birzamatu"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Irten"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>I"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Aukerak"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Erakutsi automatikoki hautatutako paketeak"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Laguntza"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Update"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Bilatu:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Garbitu"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instalatu"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Irten"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Errore larria"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Errore larria gertatu da: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1683,13 +1468,12 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Eguneratze-euskarria badago lehendik"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1705,13 +1489,12 @@ msgstr ""
 "\n"
 "Ondoren, %s berrabiarazi."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Nola aukeratu ispilua eskuz"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1725,58 +1508,56 @@ msgstr ""
 "\n"
 "Ondoren, %s berrabiarazi."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Itxaron, pakete erabilgarriak bilatzen..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Itxaron, paketeen datu-basea irakurtzen..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "%s aztertzen"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "aldaketak:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Kendu .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Erabili .%s fitxategi nagusi gisa"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ez egin ezer"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalazioa amaitu da"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Aztertu..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Eskatutako pakete guztiak ondo instalatu dira."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Arazoa sortu da instalatzean"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1786,18 +1567,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Ezin dira iturburu-paketeak lortu."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ezin dira iturburu-paketeak lortu. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1809,38 +1589,34 @@ msgstr ""
 "Erroreen berri eman da:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Paketearen instalazioa..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Berrabiarazten..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Paketearen instalazioa..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Aldatu euskarria"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sartu \"%s\" izena duen euskarria [%s] gailuan"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' paketea deskargatzen (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Paketeen sinadurak egiaztatzen..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1854,13 +1630,12 @@ msgstr ""
 "\n"
 "Instalazioarekin aurrera jarraitu nahi duzu?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1871,23 +1646,21 @@ msgstr ""
 "%s\n"
 "Komeni da zure euskarrien datu-basea eguneratzea."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Paketeen instalazioa prestatzen..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketea instalatzen (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "ezin da rpm fitxategira sarrera eduki [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1899,43 +1672,33 @@ msgstr ""
 "Konfigurazio fitxategi batzuk `.rpmnew' edo `.rpmsave' luzapenarekin \n"
 "sortu dira, batzuk azter ditzakezu ekintzak egiteko:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Pakete hauek eguneraketa informazioa dakarte"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Paketearen gaineko informazio gehiago... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Ez da instalatzeko paketerik aurkitu."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Errore konponezina: ez da instalatzeko paketerik aurkitu."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Itxaron, paketeen datu-basea irakurtzen..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Itxaron, paketeak kentzen..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Arazoa sortu da kentzean"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1945,8 +1708,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1958,8 +1720,8 @@ msgstr ""
 "Tresna hau lagungarria izango zaizu ordenagailutik zein software kendu\n"
 "nahi duzun aukeratzeko."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1971,13 +1733,11 @@ msgstr ""
 "Tresna honek zure konputagailuan instalatu nahi dituzun eguneraketak\n"
 "aukeratzen lagunduko dizu."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Ongi etorri software instalazio tresnara!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1991,214 +1751,172 @@ msgstr ""
 "CDROM edo DVDan. Tresna hau lagungarria izango zaizu ordenagailuan\n"
 "instalatu nahi duzun softwarea aukeratzeko."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Software Eguneraketa"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Update"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Software Eguneraketa"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Mesedez sartu proxy-ra sartzeko zure egiaztapen datuak\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Erabiltzaile izena:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Software-paketeak kentzea"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Software Paketeen Eguneraketa"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Software-paketeen instalazioa"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Ez"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Bai"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informazioa..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgika"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Suitza"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Txekiar Errepublika"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Alemania"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grezia"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Espainia"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Frantzia"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hungaria"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Herbehereak"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Errusia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Eslovakia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Erresuma Batua"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Txina"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Estatu Batuak"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2210,8 +1928,7 @@ msgstr ""
 "\n"
 "Jarraituko dut?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2223,23 +1940,26 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s aukera"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Itxaron mesedez, ispiluen helbideak jaisten."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Itxaron, ispiluen helbideak deskargatzen Mandriva-en web gunetik."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Errorea deskargatzean"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2253,8 +1973,8 @@ msgstr ""
 "Baliteke sarea edo webgunea eskuragaitz egotea.\n"
 "Mesedez saiatu berriro beranduago."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2268,18 +1988,15 @@ msgstr ""
 "Baliteke sarea edo Mandriva-en web gunea erabilgarri ez egotea.\n"
 "Saiatu berriro geroago."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Ez dago ispilurik"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Ezin dut ispilu egokirik aurkitu."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2293,69 +2010,64 @@ msgstr ""
 "prozesadorearen arkitektura Mandriva Linux Eguneratze Ofizialak ez onartzea\n"
 "da."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Aukeratu nahi duzun ispilua."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' euskarrirako fitxategia kopiatzen..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' euskarriaren fitxategia aztertzen..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' euskarriaren fitxategia aztertzen..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " eginda."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " huts egin du!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s, %s euskarritik"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "`%s'(r)en deskarga abiarazten..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s'(r)en deskarga, falta den denbora:%s, abiadura:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s'(r)en deskarga, abiadura:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Itxaron, euskarria eguneratzen ari da..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Akatsa paketeak eskuratzerakoan"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2370,36 +2082,31 @@ msgstr ""
 "ondoren berriro berkonfiguratzeko, edo une honetan ezin da atzeman\n"
 "eta beranduago saiatu behar zenuke berriro."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Eguneratu euskarriak"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Ez da euskarri aktiborik aurkitu. Euskarriren batzu aktibatu behar dituzu "
 "haiek eguneratu ahal izateko."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Hautatu eguneratu nahi duzun euskarria:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Guztia hautatu"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Eguneratu"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2411,8 +2118,8 @@ msgstr ""
 "Erroreak:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2422,18 +2129,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Ezin da euskarria sortu."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Ezin izan da euskarria gehitu"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2443,8 +2148,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2454,8 +2159,8 @@ msgstr ""
 "bertsioarekin (%s).\n"
 "Ezgaitu egingo da."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2465,13 +2170,11 @@ msgstr ""
 "Mandriva Linuxen bertsioarekin (%s).\n"
 "Ezgaitu egingo da."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Laguntza atzeko planoan abiarazten da"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2746,3 +2449,15 @@ msgstr "Kendu softwarea"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Software-euskarrien kudeatzailea"
+
+#~ msgid "Stop"
+#~ msgstr "Gelditu"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Pakete guztiak, euskarri-biltegiaren arabera"
+
+#~ msgid "Normal information"
+#~ msgstr "Informazio normala"
+
+#~ msgid "Maximum information"
+#~ msgstr "Gehienezko informazioa"
diff --git a/po/fa.po b/po/fa.po
index cfbafe0f..2d99c0fa 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fa\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-02-06 09:05-0500\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -16,13 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "نوع رسانه را انتخاب کنید"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -44,18 +43,16 @@ msgstr ""
 " می‌آیند)، یا منابعی که بروزسازیهای رسمی توزیع شما عرضه میکنند.\n"
 "(شما میتوانید هر دو را اضافه کنید، ولی مجبورید آن را در دو گام انجام دهید.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "منابع انتشار"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "بروزسازی‌های رسمی"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -71,104 +68,86 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "لطفا صبر کنید، در حال افزودن رسانه..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "افزودن یک رسانه"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "پرونده‌های محلی"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "مسیر:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "کارگزار FTP "
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "نشانی اینترنتی:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "کارگزار FTP "
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "کارگزار‌ HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "دستگاه قابل انتقال"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "مسیر یا نقطه سوارسازی:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "دستگاه قابل انتقال"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "مرور..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "ثبت‌ورود:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "مسیر نسبی به synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "اگر خالی گذاشته شود، synthesis/hdlist بطور خودکار شناسایی خواهد شد"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "نام:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "ایجاد کردن رسانه برای تمام توزیع"
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "انتخاب کردن رسانه‌ای که می‌خواهید بروزسازی کنید:"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "شما باید حداقل دو ورودی اول را پر کنید."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -176,13 +155,11 @@ msgstr ""
 "یک رسانه با آن نام از قبل وجود دارد،\n"
 "آیا واقعاً می‌خواهید آن را جایگزین کنید؟"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "افزودن یک رسانه:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "نوع رسانه:"
 
@@ -190,10 +167,9 @@ msgstr "نوع رسانه:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "لغو"
 
@@ -202,101 +178,86 @@ msgstr "لغو"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "تأیید"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "گزینه‌های جهانی برای نصب بسته..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "همیشه"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "هرگز"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "تصدیق RPMs برای نصب شدن"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "بارگیری برنامه برای استفاده:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "برداشتن متن کد"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "آیا مطمئن هستید که می‌خواهید متن کد \"%s\" را بردارید؟"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "لطفا صبر کنید، در حال برداشتن رسانه..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "ویرایش یک رسانه"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "ویرایش رسانه‌ی \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "ذخیره‌ی تغییرات"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "پراکسی..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "برای ادامه باید رسانه‌ای را به داخل دستگاه بگذارید"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "برای ذخیره‌ی تغییرات باید رسانه را درون دستگاه بگذارید."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "پیکربندی پراکسی‌ها"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "تنظیمات پراکسی برای رسانه‌ی \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "تنظیمات جهانی پراکسی"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -305,166 +266,137 @@ msgstr ""
 "(ترکیب: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "نام میزبان پراکسی:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "شما می‌توانید یک کاربر/گذرواژه را برای تأیید هویت پراکسی مشخص کنید:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "کاربر:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "افزودن یک گروه موازی"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "ویرایش یک گروه موازی"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "افزودن محدوده‌‌ی رسانه‌ای"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "رسانه‌ای ‌را برای افزودن در محدوده رسانه‌ها انتخاب کنید:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "افزودن یک میزبان"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "نام میزبان یا نشانی آی‌پی میزبان را برای افزودن تایپ کنید:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "ویرایش گروه موازی \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "نام گروه:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "پایان‌نامه:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "محدوده رسانه:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "افزودن"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "برداشتن"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "میزبان‌ها:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "پیکربندی urpmi موازی (اجرای توزیعی urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "گروه"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "پایان‌نامه"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "محدوده رسانه"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "پایان‌نامه"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "فرمان"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(هیچکدام)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "ویرایش"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "افزودن..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "اداره‌ی کلیدها برای امضاهای دیجیتالی بسته‌ها"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "رسانه"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "هیچ نامی یافت نشد، کلیدی در دسته کلید rpm وجود ندارد!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "افزودن یک کلید"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "انتخاب یک کلید برای اضافه کردن به رسانه‌ی %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "برداشتن یک کلید"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -473,37 +405,32 @@ msgstr ""
 "(نام کلید: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "افزودن یک کلید..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "برداشتن کلید"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "پیکربندی رسانه"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "به‌کارافتاده؟"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "بروزسازی"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -513,38 +440,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "افزودن سفارشی..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "بروزسازی..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "اداره‌ی کلیدها..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "موازی..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "گزینه‌های جهانی"
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "راهنما"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -554,8 +475,7 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -569,8 +489,7 @@ msgstr ""
 "استفاده کنید کمک خواهد کرد. آنها سپس برای نصب بسته‌ی جدید نرم‌افزار یا \n"
 "انجام بروزسازی در دسترس خواهند بود."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -582,13 +501,23 @@ msgstr ""
 "رسانه‌ی دیگری بر رومیزی دیگری دارید، یا اکنون در حال\n"
 "نصب بسته‌هاید؟)"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "ناتوان در افزودن رسانه، عدم وجود یا آرگومان‌های اشتباه"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"شما در شرف افزودن رسانه‌ی جدید بسته‌ها هستید، '%s'.\n"
+"این بدین معنی است که شما قادر خواهید بود بسته‌های نرم‌افزار\n"
+"جدیدی را به سیستم خود از آن رسانه‌ی جدید اضافه کنید."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -598,91 +527,85 @@ msgstr ""
 "این بدین معنی است که شما قادر خواهید بود بسته‌های نرم‌افزار\n"
 "جدیدی را به سیستم خود از آن رسانه‌ی جدید اضافه کنید."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "رسانه‌ی '%s' با موفقیت اضافه شد."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "رسانه‌ی '%s' با موفقیت اضافه شد."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "طرز استفاده: %s [گزینه]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, fuzzy, c-format
+#: ../rpmdrake:44
+#, fuzzy
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       -  فقط بروزسازی رسانه‌های بروزسازی.\n"
 
-#: ../rpmdrake:42
-#, fuzzy, c-format
+#: ../rpmdrake:45
+#, fuzzy
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, fuzzy, c-format
+#: ../rpmdrake:49
+#, fuzzy
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                    گزارش شبح پشتیبان‌درایک\n"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "در حال اجرا در حالت کاربری"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -692,634 +615,518 @@ msgstr ""
 "شما قادر نخواهید بود تغییراتی را بر سیستم انجام دهید، ولی هنوز\n"
 "می‌توانید پایگاه داده‌ی موجود را مرور کنید."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "قابل دست‌یابی"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "بایگانی"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "ذخیره‌ی پشتیبان"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "نگارش سی‌دی"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "فشرده‌سازی"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "دیگری"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "کتاب‌ها"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "کتاب‌های رایانه"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "پرسش‌های مداوم"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "چگونگی‌ها"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "نوشتجات"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "رد و بدل پیغام"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "سرویس‌های صف"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "ارتباطات"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "پایگاه‌های داده"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "توسعه برنامه"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "توسعه برنامه"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME و GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "جاوا"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE و Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "هسته"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "ویرایشگرها"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "آموزش"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "شبیه‌سازها"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "ابزار پرونده"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "بازی‌ها"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "ماجرا"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "بازی‌ها"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "آرکید"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "تخته‌ها"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "ورق‌ها"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "پازل‌ها"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "ورزش‌ها"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "تاکتیک"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "رومیزی گرافیکی"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "رومیزی گرافیکی"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "بر پایه‌ی FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "گنوم"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "اره‌ماهی"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "گرافیک‌ها"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "پایشگری"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "چندرسانه‌ای"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "شبکه‌کاری"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "گپ"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "شبکه‌کاری"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "انتقال‌ پرونده"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "پیغام‌رسانی آنی"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "پست"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "اخبار"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "دسترسی از دور دست"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "وب"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "دفتر"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "کلیدهای عمومی"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "منتشر کردن"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "دانش‌ها"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "نجوم"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "دانش‌ها"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "زیست‌شناسی"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "شیمی"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "دانش رایانه‌ای"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "دانش زمین‌شناسی"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "ریاضیات"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "فیزیک"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "پوسته‌ها"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "صوت"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "سیستم"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "پایه"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "پیکربندی"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "سیستم"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "آغازگری و مقداردهی"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "پیکربندی"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "سخت‌افزار"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "بسته‌بندی"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "چاپ"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "گسترش"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "گسترش"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "قلم‌ها"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "کنسول"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "قلم‌ها"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "نوع حقیقی"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "نوع۱"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "بین‌المللی کردن"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "هسته و سخت‌افزار"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "کتابخانه‌ها"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "کارگزارها"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "پایانه‌ها"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "ابزار متن"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "اسباب‌بازی‌ها"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "ویدیو"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(وجود ندارد)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "نتایج جستجو"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "نتایج جستجو (هیچ)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "لطفا صبر کنید، در حال جستجو..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "توقف"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "قابل افزودن"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "قابل ارتقاء"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "قابل افزودن"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "انتخاب نشده"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "انتخاب شده"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "انتخاب نشده"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "اهمیت: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "دلیل برای بروزسازی:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "در توضیحات"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "پرونده‌ها:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "ثبت‌تغییرات:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "رسانه: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "نسخه‌ی نصب شده‌ی کنونی: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "نام: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "نسخه: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "اندازه: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s کیلو‌بایت"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "اهمیت: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "اندازه: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "خلاصه: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "دلیل برای بروزسازی:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "توصیف: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "در توضیحات"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "اطلاعات بیشتر درباره‌ی بسته..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "لطفاً انتخاب کنید"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "یکی از بسته‌های به دنبال آمده مورد نیاز است:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "لطفاً انتخاب کنید"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "لطفا صبر کنید، در حال فهرست کردن بسته‌ها..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "بدون بروزسازی"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1329,29 +1136,24 @@ msgstr ""
 "به‌روزسازیی برای بسته‌ی نصب شده بر رایانه‌ی شما وجود ندارد یا شما\n"
 "قبلاً همه‌ی آنها را نصب کرده‌اید."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "همه"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "اطلاعات بیشتر"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "اطلاعات بسته‌ها"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "بعضی از بسته‌های اضافی لازم است برداشته شوند"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1361,13 +1163,11 @@ msgstr ""
 "برداشته شوند:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "بعضی از بسته‌ها نمی‌توانند برداشته شوند"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1375,8 +1175,7 @@ msgstr ""
 "برداشتن این بسته‌ها سیستم شما را می‌شکند، متأسفم:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1385,13 +1184,11 @@ msgstr ""
 "بسته‌های بدنبال آمده بخاطر وابستگی‌های آنها اکنون نباید انتخاب شوند:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "بسته‌های بیشتری لازم است"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1401,18 +1198,17 @@ msgstr ""
 "نصب شود:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (به لیست نادیده گیری تعلق دارد)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "بعضی از بسته‌ها نمی‌توانند نصب شوند"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1422,123 +1218,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "بعضی بسته‌ها لازم است برداشته شوند"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "انتخاب شده: %d مگابایت / فضای دیسک آزاد: %d مگابایت"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "اندازه‌ی انتخاب شده: %d مگابایت"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "توضیحی برای این بسته در دسترس نیست\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "بروزسازی‌های امنیتی"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "بروزسازی‌های اشکال‌زدایی‌"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "نصب"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "بروزسازی‌های عادی"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "نصب"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s انتخابها"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "انتخاب‌های ماندریبا"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "همه‌ی بسته‌ها، الفبایی"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "همه‌ی بسته‌ها، بوسیله‌ی گروه"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "همه‌ی بسته‌ها، بوسیله در دسترسی بروزسازی آنها"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "همه‌ی بسته‌ها، بوسیله اندازه"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "تمام بسته‌ها، بوسیله‌ی وضعیت انتخاب"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "همه‌ی بسته‌ها، بوسیله انبار رسانه"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "همه‌ی بسته‌ها، بوسیله در دسترسی بروزسازی آنها"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "فقط مرتب شده با تاریخ نصب باقی بماند"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "همه‌ی بسته‌ها، بوسیله‌ی گروه"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "بروزسازی‌های عادی"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "بروزسازی‌های اشکال‌زدایی‌"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "بروزسازی‌های عادی"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "بروزسازی‌های امنیتی"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "در نام‌ها"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "در توضیحات"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "در نام‌های پرونده‌"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "اطلاعات عادی"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "حداکثر اطلاعات"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "نخست باید بعضی از بسته‌ها را انتخاب کنید."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "بسته‌های بیش از اندازه انتخاب شده‌اند"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1554,7 +1335,7 @@ msgstr ""
 "آیا واقعاً می‌خواهید تمام بسته‌های انتخاب شده را نصب کنید؟"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1568,89 +1349,100 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_پرونده"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_رسانه‌ی بروزسازی"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_بازنشاندن انتخاب"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/بارگذاری مجدد لیست _بسته‌ها"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_ترک"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_گزینه‌ها"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_نشان دادن خودکار بسته‌های انتخاب شده"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_راهنما"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "بروزسازی ماندریبا"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "یافتن:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "جستجو"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "پاک کردن"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "نصب"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "ترک"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "خطای مهلک"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "یک خطای مهلک رخ داد: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1662,13 +1454,12 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "رسانه‌ی از قبل موجود بروزسازی"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1684,13 +1475,12 @@ msgstr ""
 "\n"
 "پس از آن %s را دوباره شروع کنید."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "چگونگی انتخاب دستی آینه‌ی FTP خود"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1705,58 +1495,56 @@ msgstr ""
 "\n"
 "پس از آن %s را دوباره شروع کنید."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "لطفا صبر کنید، در حال یافتن بسته‌های موجود..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "لطفا صبر کنید، در حال خواندن بانک اطلاعات بسته‌ها..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "در حال بازرسی %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "تغییرات:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "برداشتن .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "استفاده از .%s مانند پرونده‌ی اصلی"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "هیچ کاری نکن"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "نصب پایان یافت"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "معاینه..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "تمام بسته‌های تقاضا شده با موفقیت نصب شده‌اند."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "اشکال هنگام نصب"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1766,18 +1554,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "نمی‌توان بسته‌های منبع را دریافت کرد."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "نمی‌توان بسته‌های منبع را دریافت کرد، متأسفم. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1789,38 +1576,34 @@ msgstr ""
 "خطا(های) گزارش شده:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "نصب بسته..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "مقداردهی..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "نصب بسته..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "تعویض رسانه"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "لطفاً رسانه‌ی بنام \"%s\" را در دستگاه [%s] داخل کنید"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "بارگیری بسته‌ی `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "در حال تصدیق امضای بسته‌ها..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1834,13 +1617,12 @@ msgstr ""
 "\n"
 "آیا می‌خواهید نصب را ادامه دهید؟"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1852,23 +1634,22 @@ msgstr ""
 "\n"
 "شما ممکن است بخواهید بانک اطلاعات رسانه‌ها را بروزسازی کنید."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "در حال آماده کردن نصب بسته‌ها..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "در حال نصب بسته‌ی `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "ناتوان در دستیابی به پرونده‌ی rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1880,43 +1661,33 @@ msgstr ""
 "بعضی از پرونده‌های پیکربندی مانند `.rpmnew' یا `.rpmsave', ایجاد شده‌اند\n"
 "شما می‌توانید بعضی از آنها را برای اقدامات لازم معاینه کنید:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "این بسته‌ها با اطلاعات ارتقائی آمده‌اند"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "اطلاعات بیشتر درباره‌ی بسته... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "هیچ بسته‌ای برای نصب یافت نشد."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "خطای غیر قابل تعمیر: هیچ بسته‌ای برای نصب پیدا نشد، متأسفم."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "لطفا صبر کنید، در حال خواندن بانک اطلاعات بسته‌ها..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "لطفا صبر کنید، در حال برداشتن بسته‌ها..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "اشکال هنگام برداشتن"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1926,8 +1697,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1939,8 +1709,8 @@ msgstr ""
 "این ابزار در انتخاب نرم‌افزاری که می‌خواهید از این رایانه بردارید\n"
 "به شما کمک خواهد کرد."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1952,13 +1722,11 @@ msgstr ""
 "این ابزار به شما در انتخاب بروزسازی‌هایی که می‌خواهید بر رایانه خود نصب\n"
 "کنید کمک خواهد کرد."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "به ابزار نصب نرم‌افزار خوش آمدید!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1972,214 +1740,174 @@ msgstr ""
 "می‌شود. این ابزار به شما در انتخاب نرم‌افزاری که می‌خواهید بر رایانه‌ی خود نصب\n"
 "کنید کمک خواهد کرد."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "بروزسازی نرم‌افزار"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "بروزسازی ماندریبا"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "بروزسازی نرم‌افزار"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "لطفاً نشانی پست الکترونیکی خود را در زیر وارد کنید"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "نام‌کاربر:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "برداشتن بسته‌های نرم‌افزار"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "بروزسازی بسته‌های نرم‌افزار"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "نصب بسته‌های نرم‌افزار"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "نه"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "بله"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "اطلاعات..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "اطریش"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "استرالیا"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "بلژیک"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "برزیل"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "کانادا"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "سوئیس"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "کوستا ریکا"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "جمهوری چک"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "آلمان"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "دانمارک"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "یونان"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "اسپانیا"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "فنلاند"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "فرانسه"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "مجارستان"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "اسرائیل"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "ایتالیا"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "ژاپن"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "کره"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "هلند"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "نروژ"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "لهستان"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "پرتغال"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "روسیه"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "سوئد"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "سنگاپور"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "اسلواکی"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "تایوان"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "بریتانیا"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "چین"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "ایالات متحده"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2191,8 +1919,7 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2204,23 +1931,26 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s انتخابها"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "لطفاً صبر کنید، در حال بارگیری نشانی‌های آینه‌ها."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "لطفاً صبر کنید، در حال بارگیری نشانی‌های آینه‌ها از وبگاه ماندریبا."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "خطا هنگام بارگیری"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2234,8 +1964,8 @@ msgstr ""
 "شبکه یا وبگاه شاید در دسترس نباشند.\n"
 "لطفاً بعداً دوباره امتحان کنید."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2249,18 +1979,15 @@ msgstr ""
 "شبکه یا وبگاه ماندریبا شاید در دسترس نباشند.\n"
 "لطفاً بعداً دوباره امتحان کنید."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "هیچ آینه‌ای"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "نمی‌توانم هیچ آینه مناسبی را پیدا کنم."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2274,69 +2001,64 @@ msgstr ""
 "بدلیل عدم حمایت از ساختار پردازه‌گر شما بوسیله‌ی به‌روزسازی‌های رسمی\n"
 "لینوکس ماندریبا می‌باشد."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "لطفاً آینه‌ی مورد نظرتان را انتخاب کنید."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "کپی کردن پرونده برای رسانه `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "آزمایش کردن پرونده‌ی رسانه‌ی `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "در حال آزمایش کردن پرونده‌ی دور دست رسانه‌ی `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " انجام شد."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " شکست خورد!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s از رسانه‌ی %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "در حال شروع بارگیری `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "بارگیری `%s'، زمان باقیمانده: %s، سرعت:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "بارگیری `%s'، سرعت:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "لطفا صبر کنید، در حال بروزسازی رسانه..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "خطا در دریافت بسته‌ها"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2352,34 +2074,29 @@ msgstr ""
 " کنید، یا آن اکنون در دسترس نیست و شما باید بعداً دوباره امتحان\n"
 " کنید. "
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "رسانه‌ی بروزسازی"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "انتخاب کردن رسانه‌ای که می‌خواهید بروزسازی کنید:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "انتخاب همگی"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "بروزسازی"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2391,8 +2108,8 @@ msgstr ""
 "خطاها:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2402,18 +2119,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "نمی‌توانم رسانه را ایجاد کنم."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "ناموفق بودن هنگام اضافه کردن رسانه"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2423,8 +2138,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2434,8 +2149,8 @@ msgstr ""
 "می‌کنید (%s) تطابق ندارد.\n"
 "آن از کار انداخته خواهد شد."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2445,13 +2160,11 @@ msgstr ""
 "که شما اجرا می‌کنید (%s) تطابق ندارد.\n"
 "آن از کار انداخته خواهد شد."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "راهنما در پس‌زمینه اجرا شد"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "پنجره‌ی راهنما شروع شده است، باید بزودی بر روی رومیزی شما ظاهر گردد."
@@ -2726,6 +2439,18 @@ msgstr "برداشتن نرم‌افزار"
 msgid "Software Media Manager"
 msgstr "مدیر رسانه‌های نرم‌افزاری"
 
+#~ msgid "Stop"
+#~ msgstr "توقف"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "همه‌ی بسته‌ها، بوسیله انبار رسانه"
+
+#~ msgid "Normal information"
+#~ msgstr "اطلاعات عادی"
+
+#~ msgid "Maximum information"
+#~ msgstr "حداکثر اطلاعات"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "همه چیز بدرستی نصب شد"
 
diff --git a/po/fi.po b/po/fi.po
index 774a7986..9321e93d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fi - Mandriva 2006 Release\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-09-13 21:00+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -22,13 +23,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Valitse median tyyppi"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -52,18 +51,16 @@ msgstr ""
 "tarjoavat viralliset päivitykset käyttämäsi jakelua varten. (Voit lisätä\n"
 "molemmat, mutta sinun pitää tehdä sitä yksi kerrallaan.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Jakelulähteet"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Viralliset päivitykset"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -81,104 +78,85 @@ msgstr ""
 "\n"
 "Sopiiko että jatketaan?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Odota, lisätään lähteet..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Lisää lähde"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Polku:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP-palvelin"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "FTP-palvelin"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP-palvelin"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Siirrettävä laite"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Polku tai liitoskohta:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Siirrettävä laite"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Selaa..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Käyttäjätunnus:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Suhteellinen polku tiedostoon synthesis tai hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Jos jätetään tyhjäksi haetaan synthesis/hdlist automaattisesti"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nimi:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Luo media kokonaiselle jakelulle"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Etsi päivityksiä tästä mediasta"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Sinun pitää täyttää ainakin kaksi ensimmäistä kohtaa."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -186,13 +164,11 @@ msgstr ""
 "Tämän niminen lähde on jo olemassa,\n"
 "Oletko varma että haluat korvata sen?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Lisätään lähde:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Lähteen tyyppi:"
 
@@ -200,10 +176,9 @@ msgstr "Lähteen tyyppi:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -212,101 +187,86 @@ msgstr "Peruuta"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "OK"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Yleisasetukset ohjelmistopakettien asennusta varten"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "aina"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "ei koskaan"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Varmista asennettavia RPM paketteja: "
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Käytettävä latausohjelma:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Ohjelmistopakettien poisto"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Oletko varma että haluat poistaa lähteen \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Odota, poistetaan lähde..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Muokkaa lähdettä"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Muokataan lähdettä \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Tallenna muutokset"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Välityspalvelin..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Sinun pitää asettaa media jatkaaksesi"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Tallentaaksesi muutokset sinun pitää asettaa media asemaan."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Määritä välityspalvelin"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Välityspalvelinasetukset lähteelle \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Yleiset välityspalvelinasetukset"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -315,167 +275,138 @@ msgstr ""
 "portti (muodossa: <palvelinnimi[:portti]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Välityspalvelimen nimi:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Voit halutessasi antaa tunnuksen/salasanan välityspalvelimen tunnistukseen:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Käyttäjä:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Lisää rinnakkaisryhmä"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Muokkaa rinnakkaisryhmää"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Lisää lähderajoitus"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Valitse lisättävä lähde lähderajoitukseen:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Lisää kone"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Kirjoita koneen nimi tai IP-osoite jonka haluat lisätä:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Muokataan rinnakkaisryhmää \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Ryhmänimi:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokolla:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Lähderajoitus:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Lisää"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Poista"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Koneet:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Aseta rinnakkais-urpmi (hajautettu urpmi:n suoritus)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Ryhmä"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokolla"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Lähderajoitus"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokolla"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Komento"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(tyhjä)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Lisää..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Pakettien digitaalisten allekirjoitusavaimien hallinta"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Lähde"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Avaimet"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "nimeä ei löydetty, avainta ei ole rpm-avaintiedostossa!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Lisää avain"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Valitse lisättävä avain lähteelle %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Poista avain"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -484,37 +415,31 @@ msgstr ""
 "(avaimen nimi: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Lisää avain..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Poista avain"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Määritä lähteet"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Käytössä?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Päivitykset?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -524,38 +449,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Lisää mukautettu..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Päivitä..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Avaimien hallinta..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Rinnakkaistoiminnot..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Yleiset asetukset..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Ohje"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -565,8 +484,7 @@ msgstr ""
 "\n"
 "Sopiiko että jatketaan?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -580,8 +498,7 @@ msgstr ""
 "käyttää tietokoneessasi. Sen jälkeen ne ovat käytettävissä jos haluat\n"
 "asentaa uusia paketteja tai päivittää jo asennettuja."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -593,14 +510,24 @@ msgstr ""
 "lähteidenhallintaohjelma toisella työpöydällä tai oletko\n"
 "juuri asentamassa paketteja?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 "Lähteen lisääminen ei onnistunut, virheelliset tai puutteelliset argumentit"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Olet lisäämässä uuden ohjelmistolähteen, `%s'.\n"
+"Tämä tarkoittaa että voit asentaa uusia ohjelmapaketteja\n"
+"järjestelmääsi uudesta ohjelmistolähteestä."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -610,18 +537,22 @@ msgstr ""
 "Tämä tarkoittaa että voit asentaa uusia ohjelmapaketteja\n"
 "järjestelmääsi uudesta ohjelmistolähteestä."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Ohjelmistolähde `%s' lisättiin onnistuneesti."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Ohjelmistolähde `%s' lisättiin onnistuneesti."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Käyttö: %s [OPTIO]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -629,43 +560,36 @@ msgstr ""
 "  --changelog-first      näytä muutoslokia ennen tiedostolistausta "
 "kuvausikkunassa"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=media1,..      rajoita valittuun mediaan"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     ehdota kaikki löydettyjen .rpmnew/.rpmsave "
 "tiedostojen yhdistäminen"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=MODE            aseta tila (install (oletus), remove, update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      älä kysy ensimmäinen vahvistus päivitystilassa"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      älä päivitä mediaa käynnistuksessä"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        älä tarkista pakettien allekirjoitukset"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -673,33 +597,27 @@ msgstr ""
 "  --parallel=alias,kone  aseta rinnakkaistila, käytä  \"alias\" ryhmä, käytä "
 "\"kone\" tietokone riippuvuuksien näyttämiseen"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    näytä ainoastaan näitä paketteja"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      valitse näitä paketteja etukäten"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 pakota suorittaminen root-tunnuksella"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           etsi paketti nimelä \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Suoritetaan käyttäjätilassa"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -709,634 +627,517 @@ msgstr ""
 "Et voi suorittaa muutoksia järjestelmään, mutta \n"
 "voit selata olemassa olevaa tietokantaa."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Käytettävyys"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arkistointi"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Varmistus"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD:n poltto"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Pakkaus"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Muu"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Kirjat"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Tietokonekirjat"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Faq"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howto"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Kirjallisuus"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Ryväs"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Viestinvälitys"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Jonotuspalvelut"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Viestintä"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Tietokannat"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Kehitys"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Kehitys"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME ja GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE ja Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Ydin"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editorit"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Opiskelu"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulaattorit"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Tiedostotyökalut"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Pelit"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Seikkailu"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Pelit"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Lautapelit"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kortti"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Ongelmanratkonta"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Urheilu"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategia"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Graafinen työpöytä"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Graafinen työpöytä"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM-pohjainen"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "IceWM"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafiikka"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Valvonta"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Verkko"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Verkko"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Tiedostonsiirto"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Pikaviestintä"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Uutiset"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Etäkäyttö"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Toimisto"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Julkiset avaimet"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Julkaisu"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Tiede"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Tiede"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kemia"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Tietokoneet"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geotieteet"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematiikka"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fysiikka"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Komentotulkit"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Ääni"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Järjestelmä"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Perus"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Asetukset"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Järjestelmä"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Käynnistys ja alustus"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Asetukset"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Laitteisto"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakkaus"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Tulostus"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Sijoitus"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Sijoitus"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Kirjasimet"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Pääte"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Kirjasimet"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bittikartta"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Kansainvälistäminen"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Ydin ja laitteisto"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Kirjastot"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Palvelimet"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Päätteet"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Tekstityökalut"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Lelut"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Ei käytettävissä)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Haun tulokset"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Haun tulokset (ei mitään)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Odota, etsitään..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Pysäytä"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Lisättävissä"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Päivitettävissä"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Lisättävissä"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Ei valittu"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Valittu"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Ei valittu"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Tärkeys: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Syy päivitykseen: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Ei kuvausta"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Tiedostot:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Muutosloki:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Lähde: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Asennettu versio: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nimi: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versio: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arkitehtuuri: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Koko: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s kt"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Tärkeys: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Koko: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Yhteenveto: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Syy päivitykseen: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Kuvaus: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Ei kuvausta"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Lisätietoa paketista..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Ole hyvä ja valitse"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Yksi seuraavista paketeista tarvitaan:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Ole hyvä ja valitse"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Odota, listataan paketteja..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Ei päivityksiä"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1345,29 +1146,24 @@ msgstr ""
 "Päivityslista on tyhjä. Tämä tarkoittaa joko ettei\n"
 "päivityksiä löydy, tai olet jo asentanut kaikki."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Kaikki"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Lisätietoa"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Lisätietoa paketista"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1376,13 +1172,11 @@ msgstr ""
 "Riippuvuuksien vuoksi myös seuraavat paketit joudutaan poistamaan:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Joitakin paketteja ei voida poistaa"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1390,8 +1184,7 @@ msgstr ""
 "Näiden pakettien poistaminen valitettavasti rikkoisi järjestelmäsi:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1401,13 +1194,11 @@ msgstr ""
 "nyt poistamaan valinnasta:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Lisäpaketteja vaaditaan"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1417,18 +1208,17 @@ msgstr ""
 "pitää asentaa:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (on ohitettavien listalla)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Joitakin paketteja ei voida asentaa"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1438,123 +1228,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Joitakin paketteja pitää poistaa"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valitut: %d Mt / Vapaata levytilaa: %d Mt"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Valittujen koko: %d Mt"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "Paketin kuvaus ei ole saatavilla\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Tietoturvapäivitykset"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Virhekorjaukset"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Asenna"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Tavalliset päivitykset"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Asenna"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s valinnat"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux valinnat"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Kaikki paketit, aakkosjärjestyksessä"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Kaikki paketit, ryhmän mukaan"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Kaikki paketit, päivityksien saatavuuden mukaan"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Kaikki paketit, koon mukaan"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Kaikki paketit, valinnan mukaan"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Kaikki paketit, lähteiden mukaan"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Kaikki paketit, päivityksien saatavuuden mukaan"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Jäämistöt, eriteltynä asennuspäivämäärän mukaan"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Kaikki paketit, ryhmän mukaan"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Tavalliset päivitykset"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Virhekorjaukset"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Tavalliset päivitykset"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Tietoturvapäivitykset"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "nimistä"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "kuvauksista"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "tiedostoista"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Tavallista tietoa"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Mahdollisimman paljon tietoa"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Sinun pitää valita joitakin paketteja ensin."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Liian paljon paketteja valittu"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1571,7 +1346,7 @@ msgstr ""
 "Oletko varma että haluat asentaa kaikki valitsemasi paketit?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1585,89 +1360,100 @@ msgstr ""
 "\n"
 "Sopiiko että jatkan?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Tiedosto"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/Päivitä lähteet"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/Palauta valinnat"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Lataa pakettilista uudelleen"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Lopeta"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>L"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Näytä automaattisesti valitut paketit"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/O_hje"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Update"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Hae:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Etsi"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Asenna"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Poistu"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Ohittamaton virhe"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Tapahtui ohittamaton virhe: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1679,13 +1465,12 @@ msgstr ""
 "\n"
 "Sopiiko että jatkan?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Olemassa olevat päivityslähteet"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1701,13 +1486,12 @@ msgstr ""
 "\n"
 "Käynnistä tämän jälkeen %s uudelleen."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Miten manuaalisesti valitset peilipalvelimen"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1721,58 +1505,56 @@ msgstr ""
 "\n"
 "Käynnistä %s tämän jälkeen uudelleen."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Odota, etsitään saatavilla olevia paketteja"
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Odota, pakettitietokantaa luetaan..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Tarkistetaan %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "muutokset:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Poista .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Käytä .%s päätiedostona"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Älä tee mitään"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Asennus on valmis"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Tarkista..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Kaikki haluamasi paketit asennettiin onnistuneesti."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Ongelma asennuksen aikana"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1782,18 +1564,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Lähdepakettien nouto epäonnistui."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Lähdepakettien nouto valitettavasti epäonnistui. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1805,38 +1586,34 @@ msgstr ""
 "Raportoidut virheet:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Pakettien asennus..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Alustetaan..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Pakettien asennus..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Vaihda mediaa"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ole hyvä ja aseta media nimeltä \"%s\" laitteeseen [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Noudetaan pakettia `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Tarkistetaan pakettien allekirjoitukset..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1850,13 +1627,12 @@ msgstr ""
 "\n"
 "Haluatko jatkaa asennusta?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1868,23 +1644,22 @@ msgstr ""
 "\n"
 "Sinun kannattaisi päivittää lähdetietokantasi."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Valmistellaan ohjelmistopakettien asennusta..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Asennetaan pakettia `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "ei oikeuksia rpm-tiedostoon [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1896,44 +1671,34 @@ msgstr ""
 "Jotkut asetustiedostot tallennettiin päätteellä '.rpmnew' tai '.rpmsave',\n"
 "voit tarkistaa ne ja tehdä tarvittavat muutokset:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Näissä paketeissa on päivitystiedot"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Lisätietoa paketista... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Yhtään pakettia ei löytynyt asennettavaksi."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Ohittamaton virhe: yhtään pakettia ei valitettavasti löytynyt asennettavaksi."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Odota, pakettitietokantaa luetaan..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Odota, paketteja poistetaan..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Ongelma poistamisen aikana"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1943,8 +1708,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1956,8 +1720,8 @@ msgstr ""
 "Tämä ohjelma auttaa sinua valitsemaan ohjelmia joita haluat\n"
 "poistaa tietokoneestasi."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1969,13 +1733,11 @@ msgstr ""
 "Tämä ohjelma auttaa sinua valitsemaan päivityksiä joita haluat\n"
 "asentaa tietokoneeseesi."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Tervetuloa ohjelmien asennustyökaluun!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1989,214 +1751,172 @@ msgstr ""
 "CD- tai DVD-levy(i)llä. Tämä ohjelma auttaa sinua valitsemaan\n"
 "ohjelmia joita haluat asentaa tietokoneeseesi."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Ohjelmisto Päivitys"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Update"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Ohjelmisto Päivitys"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Syötä tunnistetietojasi välityspalvelimen käyttämiseen\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Käyttäjänimi:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Ohjelmistopakettien poisto"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Ohjelmistopakettien päivitys"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Ohjelmistopakettien asennus"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Ei"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Tietoja..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Itävalta"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasilia"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Sveitsi"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Tsekki"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Saksa"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Tanska"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Kreikka"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Espanja"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Suomi"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Ranska"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Unkari"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japani"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norja"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Puola"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugali"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Venäjä"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Kiina"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2208,8 +1928,7 @@ msgstr ""
 "\n"
 "Sopiiko että jatketaan?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2221,23 +1940,26 @@ msgstr ""
 "\n"
 "Sopiiko että jatketaan?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s valinnat"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Odota, haetaan lista peilipalvelimista."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Odota, haetaan lista peilipalvelimista Mandrivain webbisivustosta."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Virhe latauksen aikana"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2251,8 +1973,8 @@ msgstr ""
 "Verkkoyhteytesi tai webbisivusto ei ole saatavilla.\n"
 "Yritä myöhemmin uudelleen."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2266,18 +1988,15 @@ msgstr ""
 "Verkkoyhteytesi tai Mandriva:n webbisivusto ei ole saatavilla.\n"
 "Yritä myöhemmin uudelleen."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Ei peilipalvelinta"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "En löydä yhtään sopivaa peilipalvelinta."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2291,69 +2010,64 @@ msgstr ""
 "että käyttämäsi suoritin-arkkitehtuuri ei ole tuettu\n"
 "virallisissa Mandriva Linux päivityksissä."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopioidaan lähteen `%s' tiedostoa..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Tarkistetaan lähteen `%s' tiedostoa..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Tarkistetaan lähteen `%s' etätiedostoa..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " valmis."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " epäonnistui!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s lähteeltä %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Aloitetaan `%s' lataaminen..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Ladataan `%s', aikaa jäljellä:%s, nopeus:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Ladataan `%s', nopeus:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Odota, päivitetään lähteet..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Virhe noudettaessa paketteja"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2368,34 +2082,29 @@ msgstr ""
 "oikein asetettuna - tai se on tilapäisesti poistettu käytöstä\n"
 "jolloin voit yrittää myöhemmin uudelleen."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Päivitä lähteet"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Valitse lähteet, jotka haluat päivittää:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Valitse kaikki"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2407,8 +2116,8 @@ msgstr ""
 "Virheet:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2418,18 +2127,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Lähteen luominen epäonnistui."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Virhe lisättäessä lähdettä"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2439,8 +2146,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2449,8 +2156,8 @@ msgstr ""
 "Päivityksiin käytetävä lähde `%s' ei vastaa käyttämääsi %s versiota (%s).\n"
 "Lähde poistetaan käytöstä."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2460,13 +2167,11 @@ msgstr ""
 "versiota (%s).\n"
 "Lähde poistetaan käytöstä."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Ohje käynnistetty taustalla"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "Ohjeikkuna on käynnistetty, sen pitäisi näkyä työpöydälläsi."
@@ -2741,6 +2446,18 @@ msgstr "Poista ohjelmia"
 msgid "Software Media Manager"
 msgstr "Ohjelmistolähteiden hallinta"
 
+#~ msgid "Stop"
+#~ msgstr "Pysäytä"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Kaikki paketit, lähteiden mukaan"
+
+#~ msgid "Normal information"
+#~ msgstr "Tavallista tietoa"
+
+#~ msgid "Maximum information"
+#~ msgstr "Mahdollisimman paljon tietoa"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "Kaikki asennettiin oikein"
 
diff --git a/po/fr.po b/po/fr.po
index 45bc1e8b..aa4a4cc9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,7 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fr\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-12-18 09:44+0100\n"
 "Last-Translator: Nicolas Lécureuil <neoclust@mandriva.org>\n"
 "Language-Team: Français <cooker-i18n@mandrivalinux.org>\n"
@@ -28,13 +29,11 @@ msgstr ""
 "X-Generator: KBabel 1.11\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Choix du type de média"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -59,18 +58,16 @@ msgstr ""
 "à jour officielles de votre distribution. (Vous pouvez ajouter les deux\n"
 "sources, cependant vous devrez le faire en deux étapes.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Sources pour la distribution"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Mises à jour officielles"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -89,104 +86,84 @@ msgstr ""
 "\n"
 "Êtes-vous d'accord pour continuer ?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Veuillez patienter, ajout du média..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Ajout d'un média"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Fichiers locaux"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Chemin :"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Serveur FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL :"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "Serveur RSYNC"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Serveur HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Périphérique amovible"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Chemin ou point de montage :"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Périphérique amovible"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Parcourir..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Login :"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Chemin relatif vers hdlist/synthesis :"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Laissé vide, le synthesis/hdlist sera détecté automatiquement"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nom :"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Ajouter tous les média d'une distribution"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Rechercher sur ce média pour des mises à jour"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Vous devez remplir au moins les deux premiers champs."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -194,13 +171,11 @@ msgstr ""
 "Il existe déjà un média du même nom,\n"
 "voulez-vous vraiment le remplacer ?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Ajout d'un média :"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Type de média :"
 
@@ -208,10 +183,9 @@ msgstr "Type de média :"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -220,80 +194,68 @@ msgstr "Annuler"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Ok"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Options générales d'installation"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "toujours"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "jamais"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Vérifier les RPMs à installer :"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Utiliser ce programme de téléchargement :"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Suppression de sources"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Voulez-vous vraiment supprimer la source «%s» ?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Veuillez patienter, suppression du média..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Éditer un média"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Édition du média «%s» :"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Sauvegarder"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Mandataire..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Vous devez insérer le média pour continuer"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
@@ -301,22 +263,19 @@ msgstr ""
 "lecteur."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Configurer les serveurs mandataires (proxy)"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "paramètre du proxy pour le média «%s»"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Paramètres globaux du proxy"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -326,12 +285,10 @@ msgstr ""
 "de la machine et un port optionnel (la syntaxe est :<nommachine[ :port]>) :"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Nom du serveur mandataire :"
 
 #: ../edit-urpm-sources.pl:474
-#, 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 la "
@@ -339,156 +296,129 @@ msgstr ""
 "au serveur mandataire :"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Nom d'utilisateur :"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Ajouter un groupe parallèle"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Éditer un groupe parallèle"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Ajouter un média"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Choisissez un média pour l'ajouter dans la limite :"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Ajouter un hôte"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Veuillez tapper le nom d'hôte ou l'adresse IP de l'hôte à ajouter: "
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Édition du groupe parallèle «%s» :"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocole :"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Limiter aux médias :"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Ajouter"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Supprimer"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Hôtes :"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configuration d'urpmi en mode parallèle (éxecution distribuée d'urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Groupe"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocole"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Limité aux médias"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocole"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Commande"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Éditer..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Ajouter..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Gérer les clés qui effectuent la signature des paquetages"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Média"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Clés"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "aucun nom trouvé, la clé est inconnue de rpm !"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Ajouter une clé"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Choisissez une clé à ajouter au média %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Supprimer une clé"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -497,39 +427,33 @@ msgstr ""
 "(nom de la clé :%s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Ajouter une clé..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Supprimer une clé"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Configurer les médias"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Activé ?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "M.à.J. ?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Ce média nécessite une mise à jour afin d'être utilisable. Voulez-vous le "
 "mettre à jour maintenant ? "
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -539,38 +463,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Ajouter la source personnalisée..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Mettre à jour..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Gérer les clés..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parallèle..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Options générales..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Aide"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -580,8 +498,7 @@ msgstr ""
 "\n"
 "Êtes-vous d'accord pour continuer ?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -596,8 +513,7 @@ msgstr ""
 "disponibles par la suite pour installer de nouveaux paquetages\n"
 "logiciels ou pour réaliser des mises à jour."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -610,13 +526,23 @@ msgstr ""
 "de médias logiciels ouvert sur un autre bureau, ou êtes-vous\n"
 "aussi en train d'installer des paquetages en même temps ?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Impossible d'ajouter le média, arguments mauvais ou manquants"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Vous allez ajouter un nouveau média logiciel, `%s'.\n"
+"Cela veut dire que vous pourrez ensuite ajouter de nouveaux\n"
+"paquetages logiciels sur votre système à partir de ce média."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -626,18 +552,22 @@ msgstr ""
 "Cela veut dire que vous pourrez ensuite ajouter de nouveaux\n"
 "paquetages logiciels sur votre système à partir de ce média."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Média `%s' ajouté avec succès."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Média `%s' ajouté avec succès."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Usage : %s [OPTION]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -645,44 +575,37 @@ msgstr ""
 "  -changelog-first       montrer le changelog avant la liste de fichiers\n"
 "                         dans le panneau de description"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     n'utiliser que les media donnés"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     proposer de fusionner tous les fichiers\n"
 "                         .rpmnew/.rpmsave trouvés"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            choix du mode (install (défaut), remove, update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      ne pas confirmer au lancement du mode mise à jour"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      ne pas mettre à jour ce média au démarrage "
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm - ne pas vérifier les signatures des paquetages"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -690,33 +613,27 @@ msgstr ""
 "  --parallel=alias,host  mode parallèle, avec le groupe \"alias\" et sur\n"
 "                         l'hôte \"host\""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    ne montrer que ces paquets"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      préselectionner ces paquets"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 forcer l'éxecution en tant que root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           lancer une recherche sur \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Fonctionnement en utilisateur normal"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -726,634 +643,517 @@ msgstr ""
 "Vous ne pourrez pas effectuer de modifications sur le système,\n"
 "par contre vous pourrez parcourir la base de données existante."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Accessibilité"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archivage"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Sauvegarde"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Gravure de CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compression"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Autre"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Livres"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Livres informatiques"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Littérature"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Transmission de Messages"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Services de file d'attente"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Communication"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Bases de données"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Développement"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Développement"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME et GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE et Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Noyau"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Éditeurs"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Éducation"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Émulateurs"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Outils fichiers"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Jeux"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Aventure"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Jeux"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Plateau"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cartes"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Énigmes"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sports"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Stratégie"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Environnement graphique"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Environnement graphique"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM et dérivés"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Graphisme"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Surveillance"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimédia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Réseau"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Réseau"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transfert de fichiers"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Messagerie instantanée"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Courrier électronique"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Accès distant"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Bureautique"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Clés Publiques"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publication"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Sciences"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomie"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Sciences"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chimie"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informatique"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Géosciences"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Mathématiques"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Physique"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Interpréteurs de commandes"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Son"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Système"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Configuration"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Système"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Démarrage"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Matériel"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Empaquetage"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Impression"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Déploiement"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Déploiement"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fontes"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Console"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Fontes"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internationalisation"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Noyau et matériel"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Bibliothèques"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Serveurs"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminaux"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Outils texte"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Jouets"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Non disponible)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Résultats de la recherche"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Résultats de la recherche (aucun)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Veuillez patienter, recherche en cours..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Arrêter"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Nouveaux"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Mises à jour"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Nouveaux"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Non sélectionnés"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Sélectionnés"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Non sélectionnés"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importance : "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Raison de la mise à jour : "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Pas de description"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fichiers :\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Changelog :\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Média : "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Version actuellement installée : "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Version : "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Architecture : "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Taille : "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s Ko"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Importance : "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Taille : "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Intitulé : "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Raison de la mise à jour : "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Description : "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Pas de description"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Plus d'informations sur le paquetage..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Veuillez choisir"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "L'un des paquetages suivants est nécessaire :"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Veuillez choisir"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Veuillez patienter, énumération des paquetages..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Pas de mise à jour"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1363,29 +1163,24 @@ msgstr ""
 "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:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Tous"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Plus d'infos"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informations sur les paquetages"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Des paquetages supplémentaires doivent être supprimés"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1396,13 +1191,11 @@ msgstr ""
 "doivent aussi être supprimés :\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Des paquetages ne peuvent pas être supprimés"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1410,8 +1203,7 @@ msgstr ""
 "Le fait d'enlever ce paquetage rendrait instable votre système, désolé :\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1421,13 +1213,11 @@ msgstr ""
 "doivent être déselectionnés :\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Des paquetages supplémentaires sont nécessaires"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1437,18 +1227,17 @@ msgstr ""
 "doivent aussi être installés :\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (appartient à la liste des fichiers ignorés)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Certains paquetages ne peuvent pas être installés"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1458,123 +1247,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Certains paquetages doivent être enlevés"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Sélectionnés : %d Mo / Place libre sur disque :%d Mo"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Taille sélectionnée :%d Mo"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "La description n'est pas disponible pour ce paquetage\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Mises à jour de sécurité"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Corrections de bogues"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Installer"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Mises à jour normales"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Installer"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s choix"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Choix Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Tous les paquetages, classement alphabétique"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Tous les paquetages, par groupe"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Tous les paquetages, nouveaux ou mis à jour"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Tous les paquetages, par taille"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Tous les paquetages, sélectionnés ou non"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Tous les paquetages, par média"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Tous les paquetages, nouveaux ou mis à jour"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Les feuilles seulement, par date d'installation"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Tous les paquetages, par groupe"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Mises à jour normales"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Corrections de bogues"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Mises à jour normales"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Mises à jour de sécurité"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "parmi les noms"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "parmi les descriptions"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "dans les noms de fichiers"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informations normales"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Informations maximales"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Vous devez d'abord sélectionner des paquetages."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Trop de paquetages sont sélectionnés"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1592,7 +1366,7 @@ msgstr ""
 "Voulez-vous vraiment installer tous les paquetages sélectionnés ?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1607,89 +1381,100 @@ msgstr ""
 "\n"
 "Voulez-vous continuer ?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/Mise à _jour de médias"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Remettre à zéro la sélection"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Rafraîchir la liste des _paquetages"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Quitter"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Montrer les paquetages sélectionnés automatiquement"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mise à jour Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Rechercher :"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Chercher"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Effacer"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installer"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Erreur fatale"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Une erreur fatale est survenue :%s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1702,13 +1487,12 @@ msgstr ""
 "\n"
 "Êtes-vous d'accord pour continuer ?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Des médias de mise à jour existent déjà"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1724,13 +1508,12 @@ msgstr ""
 "\n"
 "Ensuite, redémarrez %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Comment choisir manuellement votre miroir"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1744,58 +1527,56 @@ msgstr ""
 "\n"
 "Puis, redémarrez %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Veuillez patienter, recherche des paquetages disponibles..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Veuillez patienter, lecture de la base de données des paquetages..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Examen de %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "changements :"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Supprimer le .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Utiliser le .%s"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ne rien faire"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "L'installation est terminée"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Examiner..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Tous les paquetages demandés ont été installés correctement."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Des problèmes sont survenus durant l'installation"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1805,18 +1586,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Impossible d'obtenir les paquetages sources."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Impossible d'obtenir les paquetages sources, désolé. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1828,38 +1608,34 @@ msgstr ""
 "Erreur(s) rencontrées :\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Installation des paquetages..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Initialisation..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Installation des paquetages..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Changement de média"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Veuillez insérer le média nommé «%s» dans le périphérique [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Téléchargement du paquetage `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Vérification de la signature des paquetages..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1873,13 +1649,12 @@ msgstr ""
 "\n"
 "Voulez-vous continuer l'installation ?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Echec de l'installation"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1891,23 +1666,21 @@ msgstr ""
 "\n"
 "Vous devriez probablement mettre à jour vos médias."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Préparation de l'installation des paquetages..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installation du paquetage `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "impossible d'acceder au fichier rpm [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1920,44 +1693,34 @@ msgstr ""
 "`.rpmnew' ou `.rpmsave', vous pouvez maintenant les examiner\n"
 "afin de décider ce que vous souhaitez en faire:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Ces paquets sont fournis avec des informations de mise à jour"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Plus d'informations sur le paquetage... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Aucun paquetage trouvé pour l'installation."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Erreur irrécupérable : aucun paquetage trouvé pour l'installation, désolé."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Veuillez patienter, lecture de la base de données des paquetages..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Veuillez patienter, suppression des paquetages..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Un problème est survenu pendant la désinstallation"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1967,8 +1730,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1980,8 +1742,8 @@ msgstr ""
 "Cet outil va vous aider à choisir quel(s) logiciel(s) vous\n"
 "souhaitez supprimer de votre ordinateur."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1993,13 +1755,11 @@ msgstr ""
 "Cet outil va vous aider à choisir les mises à jour que vous\n"
 "souhaiter installer sur votre ordinateur."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Bienvenue à l'outil d'installation des logiciels !"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -2014,216 +1774,174 @@ msgstr ""
 "à choisir quels logiciels vous désirez installer sur votre\n"
 "ordinateur."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Mise à jour des logiciels"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mise à jour Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Mise à jour des logiciels"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 "Veuillez entrer les informations nécessaires afin d'accèder au serveur "
 "mandataire\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Nom d'utilisateur:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Suppression de Paquetages Logiciels"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Mise à jour de Paquetages Logiciels"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Installation de paquetages logiciels"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Non"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Oui"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Autriche"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australie"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgique"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brésil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Suisse"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "République Tchèque"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Allemagne"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danemark"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grèce"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Espagne"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlande"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "France"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hongrie"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israël"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italie"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japon"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Corée"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvège"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Pologne"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Russie"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Suède"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapour"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taïwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Royaume-Uni"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Chine"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "États-Unis"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2235,8 +1953,7 @@ msgstr ""
 "\n"
 "Êtes-vous d'accord pour continuer ?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2249,25 +1966,28 @@ msgstr ""
 "\n"
 "Êtes-vous d'accord pour continuer ?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s choix"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Veuillez patienter, téléchargement de la liste des miroirs."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Veuillez patienter, téléchargement de la liste des miroirs à partir du site "
 "web de Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Erreur pendant le téléchargement"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2281,8 +2001,8 @@ msgstr ""
 "Le réseau, ou bien le site internet, sont peut-être indisponibles.\n"
 "Veuillez réessayer ultérieurement."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2296,18 +2016,15 @@ msgstr ""
 "Le réseau, ou bien le site web de Mandriva, sont peut-être indisponibles.\n"
 "Veuillez réessayer ultérieurement."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Pas de miroir"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Je ne peux trouver de miroir convenable."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2321,69 +2038,64 @@ msgstr ""
 "d'entre elles est que l'architecture de votre processeur n'est\n"
 "pas supportée par les Mises à jour Officielle Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Veuillez choisir le miroir."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copie du fichier pour le média `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examen du fichier du média `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examen du fichier distant du média `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " fini."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " échec !"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s à partir du média %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Démarrage du téléchargement de `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Téléchargement de `%s', temps :%s, vitesse :%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Téléchargement de `%s', vitesse :%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Veuillez patienter, mise à jour des médias..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Erreur lors de la récuparation des paquetages"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2398,36 +2110,31 @@ msgstr ""
 "de l'enlever puis de le rajouter afin de le reconfigurer), soit il est\n"
 "actuellement inaccessible et vous devriez réessayer plus tard."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Mise à jour de médias"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Aucun média actif trouvé. Vous devez activer des médias afin de pouvoir les "
 "mettre à jour."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Veuillez choisir les médias que vous voulez mettre à jour :"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2439,8 +2146,8 @@ msgstr ""
 "Erreurs :\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2450,18 +2157,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Impossible de créer le média."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Échec lors de l'ajout du média"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2471,8 +2176,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2482,8 +2187,8 @@ msgstr ""
 "version de %s que vous utilisez (%s).\n"
 "Il va être desactivé."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2493,13 +2198,11 @@ msgstr ""
 "version de Mandriva Linux que vous utilisez (%s).\n"
 "Il va être desactivé."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Aide lancée en tâche de fond"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2775,3 +2478,15 @@ msgstr "Supprimer des Logiciels"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Gestionnaire de Médias Logiciels"
+
+#~ msgid "Stop"
+#~ msgstr "Arrêter"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Tous les paquetages, par média"
+
+#~ msgid "Normal information"
+#~ msgstr "Informations normales"
+
+#~ msgid "Maximum information"
+#~ msgstr "Informations maximales"
diff --git a/po/fur.po b/po/fur.po
index 3c8aec85..a6d7fd6e 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fur\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2004-05-18 14:42+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -15,13 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -35,18 +34,17 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:85
+#, fuzzy
 msgid "Official updates"
 msgstr "Atualizazions normalis"
 
-#: ../edit-urpm-sources.pl:87
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:88
+#, fuzzy, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -62,104 +60,87 @@ msgstr ""
 "\n"
 "Vuelistu continuâ?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Par plasè spiete, atualizazion des fonts in vore..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Zonte une font"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "File locâi"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Percors:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "Server FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Server HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Periferiche rimovibil"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Percors o pont di mount:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Periferiche rimovibil"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Cîr..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Password:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Percors relatîf di synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Se lassât vueit, synthesis/hdlist al vignarâ cirût automatichementri"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Non:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Sielç le font che tu âs voie di atualizâ:"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Tu scugnis insedâ almancul tai prins doi cjamps."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -167,13 +148,11 @@ msgstr ""
 "E je dizà une font cun chel non, vuelistu\n"
 "verementri rimplaçâle?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "O zonti une font:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Sorte di font:"
 
@@ -181,10 +160,9 @@ msgstr "Sorte di font:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Scancele"
 
@@ -193,103 +171,93 @@ msgstr "Scancele"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Ok"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Preparazion dai pachets pe instalazion..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, fuzzy, c-format
+#, fuzzy
 msgid "never"
 msgstr "Server"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Cualchi pachet nol po sedi instalât"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Scjariament di `%s', velocitât:%s"
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Rimozion Pachets Software"
 
 #: ../edit-urpm-sources.pl:352
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 "Sêstu sigûr di volê rimovi le clâf %s de font %s?\n"
 "(non de clâf: %s)"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Par plasè, spiete, e je in vore le rimozion de font..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Mude une font"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Modifiche de font \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Salve les modifichis"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Insede le font par continuâ"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Insedâ le font tal letôr par salvâ les modifichis."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Configure proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -298,166 +266,137 @@ msgstr ""
 "puarte (sintasse: <nonproxy[:puarte]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Non dal proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Tu puedis specificâ non utent e password pe autenticazion sul proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Utent:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Zonte un grop paralêl"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Mude un grop paralêl"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Zonte une font tal limit"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Sielç une font di zontâ tal limit:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Zonte un host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Insede il non o il recapit IP dal host di zontâ:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Modifiche dal grop paralêl \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Non dal grop:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Limit font:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Zonte"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Rimôf"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Host:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configure urpmi in paralêl (esecuzion distribuide di urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grop"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Limit fonts"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Comant"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(nissun)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Mude..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Zonte..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Gjestion des clâfs pe firme digjitâl dai pachets"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Fonts"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "nissun non cjatât, le clâf no esist tal keyring rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Zonte clâf"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Sielç une clâf di zontâ a le font %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Rimôf une clâf"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -466,37 +405,32 @@ msgstr ""
 "(non de clâf: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Zonte une clâf..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Rimôf clâf"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Configure les fonts"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Abilitade?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Atualize"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -506,38 +440,33 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "Zonte..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Atualize..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Gjestis clâfs..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "In paralêl..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Jutori"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -547,8 +476,7 @@ msgstr ""
 "\n"
 "Vuelistu lâ indenant?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -563,8 +491,7 @@ msgstr ""
 "software\n"
 "o pe atualizazion di chei dizâ instalâts."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -576,13 +503,23 @@ msgstr ""
 "di fonts su un altri desktop, o stâtu instalant\n"
 "dizà dai pachets?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "No rivi a zontâ le font, argoments no valevui o mancjants"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Tu stâs par zontâ une gnove font, `%s'.n Chest al ûl dî che al sarâ possibil "
+"zontâ gnûfs pachets\n"
+"software al to sisteme di che font."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -592,89 +529,80 @@ msgstr ""
 "zontâ gnûfs pachets\n"
 "software al to sisteme di che font."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Font zontade cun sucès `%s'."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Font zontade cun sucès `%s'."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Ûs: %s [OPZION]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "In esecuzion in maniere utent"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -684,634 +612,521 @@ msgstr ""
 "No tu puedarâs fa modificazions al sisteme, ma\n"
 "tu podarâs distès cjalâ tai database esistints."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Acessibilitât"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archiviâmint"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Scritôrs di CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compression"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Altri"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Libris"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Libris di informatiche"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Faq"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howto"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Leterature"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Comunicazions"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Database"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Svilup"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Svilup"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME e GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE e QT"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editôrs"
 
-#: ../rpmdrake:213
-#, fuzzy, c-format
+#: ../rpmdrake:224
+#, fuzzy
 msgid "Education"
 msgstr "Comunicazions"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Similadôrs"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Imprescj file"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Zûcs"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Aventure"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Zûcs"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Zûcs di taule"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cjartis"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Berdeis"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategjie"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Desktop grafic"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Desktop grafic"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Basât su FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafiche"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitorament"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Rêt"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Rêt"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Stramude file"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Mes istantanis"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Mail"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Acès Rimît"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ufizi"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publishing"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Siencis"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomie"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Siencis"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologjie"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chimiche"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informatiche"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Siencis de Tiere"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematiche"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fisiche"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Sunôr"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Sisteme"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Configurazion"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Sisteme"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Inviament e Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configurazion"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pachets"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Stampe"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Svilup"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Svilup"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Sortis di caratar"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Console"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Sortis di caratar"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internazionalizazion"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel e hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Librariis"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Server"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminâi"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Imprescj par scrivi"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Zûcs par fruts"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(No disponibil)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Risultâts de ricercje"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Risultâts de ricercje (nissun)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Par plasè spiete, ricercje in vore..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Ferme"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Zontabil"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Atualizabil"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Zontabil"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "No selezionât"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Selezionât"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "No selezionât"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Entitât: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Reson de atualizazion: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "tes descrizions"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "File:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Regjistri des modificazions\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Font: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Version ore presint instalade: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Non: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Version: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Dimension: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Entitât: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Dimension: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Sumari: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Reson de atualizazion: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Descrizion: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "tes descrizions"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Plui informazions sul pachet..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Par plasè sielç"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Al covente un di chescj pachets:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Par plasè sielç"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Par plasè spiete, in vore l'ordinament dai pachets..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Nissune atualizazion"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1321,29 +1136,24 @@ msgstr ""
 "no son atualizazions disponibilis par i pachets instalâts tal to computer\n"
 "o che tu les âs dizà instaladis dutis."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Ducj"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Plui informazions"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informazions sui pachets"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "E a di sedi rimovût cualchi pachet in plui"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1353,13 +1163,11 @@ msgstr ""
 "rimovûts:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Cualchi pachet nol po sedi rimovût"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1367,8 +1175,7 @@ msgstr ""
 "Mi splâs, ma rimovi chescj pachets al prejudicarès il to sisteme:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1378,13 +1185,11 @@ msgstr ""
 "sedi deselezionâts daurman:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "E coventin altris pachets"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1394,18 +1199,17 @@ msgstr ""
 "instalâts:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Cualchi pachet nol po sedi instalât"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1415,123 +1219,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Cualchi pachet al à di sedi rimovût"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selezionâts: %d MB / Spazi libar su disc: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Dimension selezionade: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Atualizazions pe sigurece"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Atualizazions coretivis"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instale"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Atualizazions normalis"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instale"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Sieltis di Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Ducj i pachets, in ordin alfabetic"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Ducj i pachets, in ordin di grop"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Ducj i pachets, in ordin di disponibilitât di atualizazions"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Ducj i pachets, in ordin di dimension"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Ducj i pachets, in ordin di stât di selezion"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Ducj i pachets, in ordin di font"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Ducj i pachets, in ordin di disponibilitât di atualizazions"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Dome fueis, in ordin di date di instalazion"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Ducj i pachets, in ordin di grop"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Atualizazions normalis"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Atualizazions coretivis"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Atualizazions normalis"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Atualizazions pe sigurece"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "tai nons"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "tes descrizions"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "tai nons dai file"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informazions normalis"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Dutis les informazions"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Tu âs di selezionâ cualchi pachet prin."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "E son selezionâts masse pachets"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1548,7 +1337,7 @@ msgstr ""
 "Vuelistu veramentri instalâ ducj i pachets selezionâts?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1563,89 +1352,103 @@ msgstr ""
 "\n"
 "Vuelistu lâ indenant?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_File"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Atualize fonts"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Scancele le selezion"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Torne a cjariâ le liste dai _pachets"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Jessî"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Opzions"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, fuzzy, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
+#, fuzzy
 msgid "/_Show automatically selected packages"
 msgstr "  --auto         - selezione automatichementri un pachet de sieltis.\n"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Jutori"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux Update"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Cjate:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Cîr"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Scancele"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instale"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Jessî"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Fal fatâl"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "A si è verificât un fal fatâl: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1657,13 +1460,12 @@ msgstr ""
 "\n"
 "Vuelistu lâ indenant?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Font pes atualizazions dizà esistint"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1679,13 +1481,12 @@ msgstr ""
 "\n"
 "Daspò, torne a inviâ %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Cemût sielzi manualmentri il mirror"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1700,58 +1501,56 @@ msgstr ""
 "\n"
 "Daspò, torne a fâ lâ %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Par plasè spiete, o cîr pachets disponibii..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Par plasè, spiete, o stoi leint il database dai pachets..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Analisi di %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "modificazions:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Rimôf .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Dopre .%s sicu file principâl"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "No sta a fâ nuie"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalazion finide"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Analizâmint..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Ducj i pachets domandâts e son stâts instalâts cun sucès."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problemis intant de instalazion"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1761,18 +1560,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "No rivi a cjapâ i pachets sorzint."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "No rivi a cjapâ i pachets sorzints, mi splâs. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1784,38 +1582,34 @@ msgstr ""
 "Fal(i) cjatâts:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalazion dai pachets..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inviament..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalazion dai pachets..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Cambie font"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "O stoi scjariant il pachet `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "O controli les firmis dai pachets..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1829,13 +1623,12 @@ msgstr ""
 "\n"
 "Vuelistu continuâ le instalazion?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalazion falade"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1847,23 +1640,22 @@ msgstr ""
 "\n"
 "Tu podaressis provâ a atualizâ il database des fonts."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Preparazion dai pachets pe instalazion..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "O stoi instalant il pachet `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "no rivi a acedi al file rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1875,43 +1667,33 @@ msgstr ""
 "Al è stât creât cualchi file di configurazion `.rpmnew' or `.rpmsave',\n"
 "tu puedis analizâju par sielzi ce fâ di lôr:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1722
-#, fuzzy, c-format
+#: ../rpmdrake:1819
+#, fuzzy, perl-format
 msgid "More information on package... [%s]"
 msgstr "Plui informazions sul pachet..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nissun pachet cjatât pe instalazion."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Fal fatâl: nissun pachet cjatât pe instalazion, mi splâs."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Par plasè, spiete, o stoi leint il database dai pachets..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Par plasè spiete, o soi rimovint i pachets..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Probleme intant de rimozion"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1921,8 +1703,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1934,8 +1715,8 @@ msgstr ""
 "Chest program a ti judarâ a sielzi cuai pachets tu vuelis rimovi dal\n"
 "to computer."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1948,13 +1729,11 @@ msgstr ""
 "to\n"
 "computer."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1968,214 +1747,178 @@ msgstr ""
 "software su CDROM o DVD. Chest program a ti judarâ a sielzi cuâl software\n"
 "tu vuelis instalâ tal to computer."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Rimozion Pachets Software"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Update"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Rimozion Pachets Software"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Par plasè insede le to frase password par %s@%s:"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Non utent:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Rimozion Pachets Software"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Rimozion Pachets Software"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalazion Pachets Software"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Si"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informazions..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Austrie"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australie"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgjiche"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasîl"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canadà"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Svuizare"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Republiche ceche"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Gjermanie"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danimarcje"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grecie"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spagne"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlandie"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "France"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ongjarie"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israêl"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italie"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Gjapon"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Coree"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Olande"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvegje"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polonie"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Russie"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Svezie"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapôr"
 
-#: ../rpmdrake.pm:403
-#, fuzzy, c-format
+#: ../rpmdrake.pm:408
+#, fuzzy
 msgid "Slovakia"
 msgstr "Slovac:"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Ream Unît"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Cine"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Stâts Unîts"
 
-#: ../rpmdrake.pm:505
-#, fuzzy, c-format
+#: ../rpmdrake.pm:518
+#, fuzzy
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2188,8 +1931,7 @@ msgstr ""
 "\n"
 "Vuelistu continuâ?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2202,25 +1944,28 @@ msgstr ""
 "\n"
 "Vuelistu continuâ?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Par plasè spiete, o stoi scjariant i recapits dai mirror dal sît di Mandriva."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Par plasè spiete, o stoi scjariant i recapits dai mirror dal sît di Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Fal tal scjiariament"
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2234,8 +1979,8 @@ msgstr ""
 "Le rêt, o il sît web di Mandriva, forsit no son disponibii.\n"
 "Par plasè prove daspò."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2249,18 +1994,15 @@ msgstr ""
 "Le rêt, o il sît web di Mandriva, forsit no son disponibii.\n"
 "Par plasè prove daspò."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nissun mirror"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2274,69 +2016,64 @@ msgstr ""
 "cuant che le architeture dal to procesôr no je sopuartade\n"
 "dalis Atualizazions Ofiziâlis Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Par plasè sielç il mirror preferît."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "O copii il file pe font `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "O esamini i file de font `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "O esamini il file rimît de font `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " fat."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " falade!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s de font %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Inviament dal scjariament di `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Scjariament di `%s', timp restât:%s, velocitât:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Scjariament di `%s', velocitât:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Par plasè spiete, atualizazion des fonts in vore..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Fal cjapant i pachets"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2354,34 +2091,30 @@ msgstr ""
 "tornâ a provâ\n"
 "daspò."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Atualize fonts"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Sielç le font che tu âs voie di atualizâ:"
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr "Selezionât"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Atualize"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2393,8 +2126,8 @@ msgstr ""
 "Fai:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2404,18 +2137,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "No rivi a creâ le font."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Fal te zonte de font"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2425,29 +2156,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Jutori inmaniât in background"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2724,6 +2453,18 @@ msgstr "Rimôf Software"
 msgid "Software Media Manager"
 msgstr "Gjestôr des Fonts Software"
 
+#~ msgid "Stop"
+#~ msgstr "Ferme"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Ducj i pachets, in ordin di font"
+
+#~ msgid "Normal information"
+#~ msgstr "Informazions normalis"
+
+#~ msgid "Maximum information"
+#~ msgstr "Dutis les informazions"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "dut al è stât instalât coretementri"
 
diff --git a/po/ga.po b/po/ga.po
index 1d23cf7b..dadf728c 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -8,7 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\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"
@@ -16,13 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -36,18 +35,17 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:85
+#, fuzzy
 msgid "Official updates"
 msgstr "Roghnaigh liebhéal slándáil"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -58,118 +56,100 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr ""
 "Fan tamall\n"
 "Checking dependencies"
 
-#: ../edit-urpm-sources.pl:128
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:130
+#, fuzzy
 msgid "Add a medium"
 msgstr "Suimigh Modúil"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Comhaid Áitiúl"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Slí:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Freastalaí FTP:"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "Freastalaí FTP:"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Freastalaí HTTP:"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
+#: ../edit-urpm-sources.pl:136
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Path or mount point:"
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Brabhsáil..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Logann:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Pasfhocal:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Ainm:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:239
+#, fuzzy
 msgid "Adding a medium:"
 msgstr "Suimigh Modúil"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr ""
 
@@ -177,10 +157,9 @@ msgstr ""
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Cealaigh"
 
@@ -189,358 +168,311 @@ msgstr "Cealaigh"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Ceart go Leor"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Ag Ullmhaigh feistiú"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "riamh"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Bainisteóir Bóg-Earraí"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:357
-#, fuzzy, c-format
+#, fuzzy
 msgid "Please wait, removing medium..."
 msgstr ""
 "Fan tamall\n"
 "Checking dependencies"
 
 #: ../edit-urpm-sources.pl:394
-#, fuzzy, c-format
+#, fuzzy
 msgid "Edit a medium"
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
 #: ../edit-urpm-sources.pl:400
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "léamh depslist comhad [%s]"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Sábháil an athraí"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
+#, fuzzy
 msgid "Proxy..."
 msgstr "Earraidh..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Úsáideoir:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:556
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a medium limit"
 msgstr "Suimigh Modúil"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:642
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Ainm grúpa:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Prótacal:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Cuir Leis"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Bain"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Óstríomhairí:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grúpa"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Prótacal"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Prótacal"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Ordú"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(ar bith)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Eagar..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Cuir Leis..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Measartha"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:789
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a key"
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:829
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remove a key"
 msgstr "Scríos Printéir"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:852
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remove key"
 msgstr "Scríos Printéir"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Nuashonraigh"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Nuashonraigh..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Cúnamh"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -549,8 +481,7 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -558,943 +489,829 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
 "to your system from that new medium."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, perl-format
+msgid "Successfully added media %s."
+msgstr ""
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Úsáid: %s [ROGHA]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
 "but you may still browse the existing database."
 msgstr ""
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Inrochtaineacht"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Cartlannú"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Déan cúltaca"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr ""
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Comhbhrú"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Eile"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Leabhraí"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Cumarsáidí"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Bunachair Sonraí"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Forbairt"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Forbairt"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, fuzzy, c-format
+#: ../rpmdrake:215
+#, fuzzy
 msgid "GNOME and GTK+"
 msgstr "Forbairt/C++"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, fuzzy, c-format
+#: ../rpmdrake:217
+#, fuzzy
 msgid "KDE and Qt"
 msgstr "Forbairt/Eithne"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Eithne"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Eagair"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Oideachas"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Iomaitheoirí"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Uirlisí Chomaid"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Cluichí"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Eachtra"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Cluichí"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Stuara"
 
-#: ../rpmdrake:218
-#, fuzzy, c-format
+#: ../rpmdrake:229
+#, fuzzy
 msgid "Boards"
 msgstr "Fidcheall"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cartaí"
 
-#: ../rpmdrake:221
-#, fuzzy, c-format
+#: ../rpmdrake:232
+#, fuzzy
 msgid "Puzzles"
 msgstr "Corcra"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Stratéis"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, fuzzy, c-format
-msgid "Graphical desktop"
-msgstr "Grafaic"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#, fuzzy
+msgid "Graphical desktop"
+msgstr "Grafaic"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr ""
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr ""
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafaic"
 
-#: ../rpmdrake:233
-#, fuzzy, c-format
+#: ../rpmdrake:244
+#, fuzzy
 msgid "Monitoring"
 msgstr "Greasánú"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Ilmheánach"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Líonrú"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Comhrá"
 
-#: ../rpmdrake:236
-#, fuzzy, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Líonrú"
+
+#: ../rpmdrake:247
+#, fuzzy
 msgid "File transfer"
 msgstr "Líonra/Fóntais"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, fuzzy, c-format
+#: ../rpmdrake:249
+#, fuzzy
 msgid "Instant messaging"
 msgstr "Líonra/Fóntais"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Post"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Nuacht"
 
-#: ../rpmdrake:242
-#, fuzzy, c-format
+#: ../rpmdrake:253
+#, fuzzy
 msgid "Remote access"
 msgstr "Líonra/Deamhain"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Oifig"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Foilsitheoireacht"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Eolaíochtaí"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Réalteolaíocht"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Eolaíochtaí"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Bitheolaíocht"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Ceimic"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Riomheolaíocht"
 
-#: ../rpmdrake:251
-#, fuzzy, c-format
+#: ../rpmdrake:262
+#, fuzzy
 msgid "Geosciences"
 msgstr "Eolaíochtaí"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Mathemaitce"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fisic"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Blaoscanna"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Fuaim"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Córas"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Bonn"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Cumraíocht"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Córas"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Tosnú"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Cumraíocht"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Crua-earraí"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr ""
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Priontáil"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Forbairt/C"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Imlonnú"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Chlofhoireanna"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Consóil"
 
-#: ../rpmdrake:267
-#, fuzzy, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Chlofhoireanna"
+
+#: ../rpmdrake:278
+#, fuzzy
 msgid "True type"
 msgstr "Cinéal"
 
-#: ../rpmdrake:268
-#, fuzzy, c-format
+#: ../rpmdrake:279
+#, fuzzy
 msgid "Type1"
 msgstr "Cinéal"
 
-#: ../rpmdrake:269
-#, fuzzy, c-format
+#: ../rpmdrake:280
+#, fuzzy
 msgid "X11 bitmap"
 msgstr "Córas/Clófhoirne/True Type"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Leabharlanna"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Freastalaithe"
 
-#: ../rpmdrake:274
-#, fuzzy, c-format
+#: ../rpmdrake:285
+#, fuzzy
 msgid "XFree86"
 msgstr "Córas/Bun"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Teirminealanna"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Uirlisí Teacs"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Cluichí"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Fís"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, fuzzy, c-format
+#: ../rpmdrake:446
+#, fuzzy
 msgid "Search results"
 msgstr "Cuardaigh"
 
-#: ../rpmdrake:439
-#, fuzzy, c-format
+#: ../rpmdrake:446
+#, fuzzy
 msgid "Search results (none)"
 msgstr "Cuardaigh"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, fuzzy, c-format
+#: ../rpmdrake:457
+#, fuzzy
 msgid "Please wait, searching..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, fuzzy, c-format
-msgid "Rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stad"
+#: ../rpmdrake:529 ../rpmdrake:746
+#, fuzzy
+msgid "Addable"
+msgstr "Ag Feistiú"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "In-uasghrádaithe"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, fuzzy, c-format
-msgid "Addable"
-msgstr "Ag Feistiú"
+#: ../rpmdrake:531
+#, fuzzy
+msgid "Not selected"
+msgstr "Tóg gach rud"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Roghnaithe"
 
-#: ../rpmdrake:523
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Tóg gach rud"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Tábhacht: "
 
-#: ../rpmdrake:553
-#, fuzzy, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr ""
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "Cuntasaí"
+
+#: ../rpmdrake:586
+#, fuzzy
 msgid "Files:\n"
 msgstr "/_Comhad"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Ainm: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Leagan: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Méid: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Tábhacht: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Méid: "
 
-#: ../rpmdrake:582
-#, fuzzy, c-format
+#. extra empty line
+#: ../rpmdrake:611
+#, fuzzy
 msgid "Summary: "
 msgstr "Coimriú"
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr ""
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Cur Síos: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "Cuntasaí"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+#, fuzzy
+msgid "Rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:618
-#, fuzzy, c-format
-msgid "Please choose"
-msgstr "Cinntigh, le do thoil"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../rpmdrake:639
-#, fuzzy, c-format
+#: ../rpmdrake:672
+#, fuzzy
+msgid "Please choose"
+msgstr "Cinntigh, le do thoil"
+
+#: ../rpmdrake:695
+#, fuzzy
 msgid "Please wait, listing packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake:657
-#, fuzzy, c-format
+#: ../rpmdrake:713
+#, fuzzy
 msgid "No update"
 msgstr "slí"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means 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:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Gach Rud"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, fuzzy, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
+#, fuzzy
 msgid "Information on packages"
 msgstr "Teip ag oscailt pacáiste"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr ""
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr ""
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:939
-#, fuzzy, c-format
-msgid "Security updates"
-msgstr "Roghnaigh liebhéal slándáil"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr ""
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Ag Feistiú:"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr ""
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Ag Feistiú:"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr ""
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
+#: ../rpmdrake:1010
+msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
+#: ../rpmdrake:1011
+msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:982
-#, c-format
-msgid "Leaves only, sorted by install date"
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "slí"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr ""
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "Security updates"
+msgstr "Roghnaigh liebhéal slándáil"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1059
-#, fuzzy, c-format
+#: ../rpmdrake:1070
+#, fuzzy
 msgid "in descriptions"
 msgstr "Cuntasaí"
 
-#: ../rpmdrake:1061
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "Fíor ainm"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr ""
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr ""
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr ""
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr ""
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1505,7 +1322,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1514,91 +1331,103 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/C_omhad"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr ""
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Ériggh"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>E"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Roghanna"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/C_úidiú"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+#, fuzzy
+msgid "/_About..."
+msgstr "/_Cúnamh/Faoi..."
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+msgid "Mandriva Linux"
+msgstr ""
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Faigh:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Glan"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Ag Feistiú:"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Éirigh"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Earráid mharfach"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1606,15 +1435,15 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1295
-#, fuzzy, c-format
+#: ../rpmdrake:1323
+#, fuzzy
 msgid "Already existing update media"
 msgstr ""
 "Fan tamall\n"
 "Checking dependencies"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1624,13 +1453,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1639,78 +1467,81 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1343
-#, fuzzy, c-format
+#: ../rpmdrake:1372
+#, fuzzy
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+#, fuzzy
+msgid "Please wait, reading packages database..."
+msgstr ""
+"Fan tamall\n"
+"Ag scrios pacáistí"
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1457
-#, fuzzy, c-format
+#: ../rpmdrake:1551
+#, fuzzy
 msgid "changes:"
 msgstr "KPresenter"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ná déan faic"
 
-#: ../rpmdrake:1489
-#, fuzzy, c-format
+#: ../rpmdrake:1583
+#, fuzzy
 msgid "Installation finished"
 msgstr "Theip ag feistiú"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Scrúdaigh..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr ""
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1718,38 +1549,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr ""
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Ag Túsú..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr ""
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1758,13 +1585,12 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Theip ag feistiú"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1772,23 +1598,22 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1645
-#, fuzzy, c-format
+#: ../rpmdrake:1742
+#, fuzzy
 msgid "Preparing packages installation..."
 msgstr "Ag Ullmhaigh feistiú"
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1796,55 +1621,44 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1722
-#, fuzzy, c-format
+#: ../rpmdrake:1819
+#, fuzzy, perl-format
 msgid "More information on package... [%s]"
 msgstr "Teip ag oscailt pacáiste"
 
-#: ../rpmdrake:1735
-#, fuzzy, c-format
+#: ../rpmdrake:1832
+#, fuzzy
 msgid "No package found for installation."
 msgstr "Ag Ullmhaigh feistiú"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1757
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Fan tamall\n"
-"Ag scrios pacáistí"
-
-#: ../rpmdrake:1809
-#, fuzzy, c-format
+#: ../rpmdrake:1858
+#, fuzzy
 msgid "Please wait, removing packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1852,8 +1666,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1861,13 +1675,11 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1876,219 +1688,180 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Nuashonrú Bogearraí"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr ""
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Nuashonrú Bogearraí"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Ainm úsáideora:"
 
-#: ../rpmdrake.pm:170
-#, fuzzy, c-format
+#: ../rpmdrake.pm:172
+#, fuzzy
 msgid "Software Packages Removal"
 msgstr "Bainisteóir Bóg-Earraí"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Bainisteóir Bóg-Earraí"
 
-#: ../rpmdrake.pm:172
-#, fuzzy, c-format
+#: ../rpmdrake.pm:174
+#, fuzzy
 msgid "Software Packages Installation"
 msgstr "Roghnú Grúpa Pacáistí"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Níl"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Tá"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Eolas..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "An Ostair"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "An Aistráil"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "An Bheilg"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "An Bhrasail"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Ceanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "An Eilvéis"
 
 # CR
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Cósta Rice"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "An Phoblacht nc tSeic"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "An Ghearmáin"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "An Ghréig"
 
 # ES
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "An Spáinn"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "An Fhionlainn"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "An Fhrainc"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "An Ungáir"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Iosrael"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "An Iodáil"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "An tSeapáin"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "An Choiré Theas"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "An Isiltír"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "An Iorua"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "An Pholainn"
 
 # PT
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "An Phortaingéil"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "An Rúis"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "An tSualainn"
 
 # SG
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singeapór"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "An tSlóvaic"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "An Téaváin"
 
 # UK
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "An Ríocht"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "An tSín"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Stáit Aontaithe Mheiriceá"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2096,8 +1869,7 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2105,25 +1877,28 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Fan tamall\n"
 "Checking dependencies"
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2132,8 +1907,8 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2142,18 +1917,16 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:538
-#, fuzzy, c-format
+#: ../rpmdrake.pm:554
+#, fuzzy
 msgid "No mirror"
 msgstr "Gan earraidh"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2162,71 +1935,68 @@ msgid ""
 "by Mandriva Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:632
-#, fuzzy, c-format
+#: ../rpmdrake.pm:648
+#, fuzzy
 msgid " failed!"
 msgstr "teip ar 'mkraid'"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:658
-#, fuzzy, c-format
+#: ../rpmdrake.pm:674
+#, fuzzy
 msgid "Please wait, updating media..."
 msgstr ""
 "Fan tamall\n"
 "Checking dependencies"
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2236,38 +2006,35 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, fuzzy, c-format
+#: ../rpmdrake.pm:733
+#, fuzzy
 msgid "Update media"
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr ""
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr ""
 "Tóg\n"
 "gach rud"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Nuashonraigh"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2275,55 +2042,51 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2599,6 +2362,9 @@ msgstr ""
 msgid "Software Media Manager"
 msgstr "Bainisteoir Chomad"
 
+#~ msgid "Stop"
+#~ msgstr "Stad"
+
 #, fuzzy
 #~ msgid "Update medium"
 #~ msgstr ""
@@ -2645,9 +2411,6 @@ msgstr "Bainisteoir Chomad"
 #~ msgid "/File/_Quit"
 #~ msgstr "/Comhad/_Ealu"
 
-#~ msgid "/Help/_About..."
-#~ msgstr "/_Cúnamh/Faoi..."
-
 #~ msgid "Disk"
 #~ msgstr "Diosca"
 
diff --git a/po/gl.po b/po/gl.po
index 3f5c440a..c3612a55 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-gl\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2006-04-11 14:41+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -18,13 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Escolla o tipo de soporte"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -49,18 +48,17 @@ msgstr ""
 "pero terá\n"
 "que facelo en dous pasos.)"
 
-#: ../edit-urpm-sources.pl:84
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:85
+#, fuzzy
 msgid "Distribution sources"
 msgstr "Fontes da distribución"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Actualizacións oficiais"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -79,116 +77,96 @@ msgstr ""
 "\n"
 "Desexa continuar?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Agarde, engadindo o soporte..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Engadir un soporte"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Ficheiros locais"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Ruta:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "Servidor RSYNC"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Servidor HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Dispositivo extraíble"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Ruta ou punto de montaxe:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Dispositivo extraíble"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Explorar..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Nome de usuario:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Ruta relativa a synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:190
+#, fuzzy
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Se o deixa en branco, probarase automáticamente o synthesis/hdlist"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nome:"
 
 #: ../edit-urpm-sources.pl:203
-#, fuzzy, c-format
+#, fuzzy
 msgid "Create media for a whole distribution"
 msgstr "Crear soporte para unha distribución completa"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Buscar actualizacións neste soporte"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "Cómpre encher como minimo as dúas primeiras entradas."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr "Xa hai un soporte con este nome, ¿desexa substituilo?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Engadindo un soporte:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tipo de soporte:"
 
@@ -196,10 +174,9 @@ msgstr "Tipo de soporte:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -208,102 +185,88 @@ msgstr "Cancelar"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "Aceptar"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Opcións globais para a instalación de paquetes..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "sempre"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nunca"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verificar os RPMs que se van instalar:"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Descargar programa a usar:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Eliminación de Fontes"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Está seguro de que desexa eliminar a fonte \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Agarde, eliminando soporte..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Editar un soporte"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Editando o soporte \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Garda-los cambios"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Necesita inseri-lo soporte para continuar"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 "Para garda-los cambios, cómpre que o soporte estea inserido na unidade."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Configura-los proxys"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Opcións do proxy para o soporte \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Opcións globais do proxy"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -312,166 +275,137 @@ msgstr ""
 "(sintaxe: <servidorproxy[:porto]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Nome de máquina do proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Debe especificar un usuario/contrasinal para a autenticación no proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Usuario:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Engadir un límite de soporte"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Engadir un servidor"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Introduza o nome do servidor ou o enderezo IP para engadilo:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocolo:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Límite do soporte:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Engadir"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "Eliminar"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Máquinas:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configurar urpmi en paralelo (execución distribuida de urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grupo"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Límite do soporte"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocolo"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Comando"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(ningún)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "Editar..."
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "Engadir..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Xestionar as claves das sinaturas dixitais dos paquetes"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "Soporte"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Claves"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "non se atopou o nome, a clave non existe no anel de claves de rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Engadir unha clave"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Escolla unha clave para engadila ó soporte %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Eliminar unha clave"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -480,39 +414,33 @@ msgstr ""
 "(nome da clave: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Engadir unha clave..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Eliminar clave"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Configura-lo soporte"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "¿Habilitado?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Actualizacións?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Este soporte necesita ser actualizado para poder usalo. ¿Desexa actualizalo "
 "agora?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -522,38 +450,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Engadir personalizado..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Actualizar..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Xestionar as claves..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Opcións globais..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Axuda"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -563,8 +485,7 @@ msgstr ""
 "\n"
 "Desexa continuar?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -578,8 +499,7 @@ msgstr ""
 "usar no seu ordenador. Despois estarán dispoñibles para instalar novos\n"
 "paquetes de software ou levar a cabo actualizacións."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -591,14 +511,24 @@ msgstr ""
 "(¿ten outro xestor de soportes noutro escritorio, ou está instalando\n"
 "paquetes agora mesmo?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 "Non foi posible engadir o soporte, faltan argumentos ou estes son incorrectos"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"Está a piques de engadir un novo soporte de paquetes, `%s'.\n"
+"Isto significa que poderá engadir novos paquetes de software\n"
+"ó seu sistema dende este novo soporte."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -608,18 +538,22 @@ msgstr ""
 "Isto significa que poderá engadir novos paquetes de software\n"
 "ó seu sistema dende este novo soporte."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "O soporte `%s' engadiuse con éxito."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "O soporte `%s' engadiuse con éxito."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Uso: %s [OPCIÓNS]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -627,76 +561,63 @@ msgstr ""
 "  --changelog-first      amosa o rexistro de cambios (changelog) antes da "
 "lista de ficheiros na ventá de descrición"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=soporte1,..    limitar ó soporte dado"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODO            establece o modo (install (predeterminado), remove, "
 "update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      non facer a primeira pregunta de confirmación no "
 "modo de actualización"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      non actualizar os soportes ó iniciar"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        non verificar as sinaturas dos paquetes"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    amosar só estes paquetes"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      preseleccionar estes paquetes"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 forza a execución coma root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Executando en modo usuario"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -706,634 +627,520 @@ msgstr ""
 "Non poderá facer modificacións no sistema,\n"
 "pero ainda poderá explora-la base de datos existente."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Accesibilidade"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arquivado"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Copias de Seguridade"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Gravación de CDs"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compresión"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "Outros"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "Libros"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Libros de informática"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, fuzzy, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
+#, fuzzy
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Comunicacións"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "Desenvolvemento"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "Desenvolvemento"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME e GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE e Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Editores"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Educación"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emuladores"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Utilidades de ficheiros"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Xogos"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Aventura"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Xogos"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Taboleiros"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cartas"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Crebacabezas"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Deportes"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Estratexia"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Escritorio gráfico"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Escritorio gráfico"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Baseado en FVWM"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitorización"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "Rede"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "Rede"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transferencia de ficheiros"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Mensaxería instantánea"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Correo-e"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Novas"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Acceso Remoto"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Oficina"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Claves Públicas"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publicación"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Ciencias"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomía"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Ciencias"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Bioloxía"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Química"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informática"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Ciencias da Terra"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matemáticas"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Física"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Son"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "Sistema"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Configuración"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "Sistema"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Arrinque e Inicio"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configuración"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Empaquetado"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Impresión"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Despregue"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Despregue"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fontes"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Consola"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Fontes"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Mapa de bits X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalización"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel e hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Librerias"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servidores"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminais"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Utilidades de texto"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Entretementos"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Non dispoñible)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Resultados da busca (ningún)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Agarde, buscando..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Parar"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Engadible"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Actualizable"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Engadible"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Non seleccionado"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Non seleccionado"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importancia: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Razón para actualizar: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Sen descrición"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Ficheiros:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Rexistro de cambios:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Soporte: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versión instalada: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versión: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arquitectura: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Tamaño: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Importancia: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Tamaño: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Resumo: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Razón para actualizar: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Descrición: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Sen descrición"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "Máis información no paquete..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Escolla"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Escolla"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Agarde, facendo a lista dos paquetes..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Sen actualización"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1343,29 +1150,24 @@ msgstr ""
 "actualizacións dispoñibles para os paquetes que ten instalados\n"
 "no seu ordenador, ou que xa as instalou todas."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Todos"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "Máis información"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Información nos paquetes"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Cómpre eliminar algúns paquetes adicionais"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1375,13 +1177,11 @@ msgstr ""
 "paquete(s):\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Non se puideron eliminar algúns paquetes"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1389,8 +1189,7 @@ msgstr ""
 "Se se eliminaran estes paquetes o sistema estropearíase, síntoo:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1400,13 +1199,11 @@ msgstr ""
 "seguinte(s) paquete(s):\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Paquetes adicionais que cómpre instalar"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1416,18 +1213,17 @@ msgstr ""
 "seguinte(s) paquete(s):\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (pertence á lista de omitir)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Non se puideron instalar algúns paquetes"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1437,123 +1233,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Cómpre eliminar algúns paquetes"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seleccionado: %d MB / Espacio libre no disco: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Tamaño seleccionado: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "A descrición deste paquete non está dispoñible\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Actualizacións de seguridade"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizacións de correccións de erros"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instalar"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Actualizacións normais"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instalar"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "Eleccións de %s"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Eleccións de Mandriva Linux"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Tódolos paquetes, por orde alfabética"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Tódolos paquetes, por grupo"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Tódolos paquetes, por dispoñibilidade da actualización"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Tódolos paquetes, por tamaño"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Tódolos paquetes, por estado da selección"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Tódolos paquetes, por soporte"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Tódolos paquetes, por dispoñibilidade da actualización"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Tódolos paquetes, por grupo"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Actualizacións normais"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Actualizacións de correccións de erros"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Actualizacións normais"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Actualizacións de seguridade"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "nos nomes"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "nas descricións"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "nos nomes dos ficheiros"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Información normal"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Información completa"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Necesita seleccionar algún paquete primeiro."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Están seleccionados demasiados paquetes"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1570,7 +1351,7 @@ msgstr ""
 "Desexa instalar tódolos paquetes seleccionados?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1584,89 +1365,100 @@ msgstr ""
 "\n"
 "Desexa continuar?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Actualiza-lo soporte"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Deseleccionar"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Recarga-la lista de _paquetes"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Saír"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Opcións"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Amosa-los paquetes _seleccionados automáticamente"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "Actualización de Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "Atopar:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Buscar"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instalar"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Saír"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Erro moi grave"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Ocorreu un erro moi grave: %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1679,13 +1471,12 @@ msgstr ""
 "\n"
 "Desexa continuar?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "O soporte de actualización xa existe"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1701,13 +1492,12 @@ msgstr ""
 "\n"
 "Despois, reinicie %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Cómo escoller manualmente un espello"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1721,58 +1511,56 @@ msgstr ""
 "\n"
 "Despois, reinicie %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Por favor agarde, buscando os paquetes dispoñibles..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Agarde, lendo a base de datos de paquetes..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Examinando %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "cambios:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Eliminar .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Usar .%s coma ficheiro principal"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Non facer nada"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalación rematada"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Examinar..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Tódolos paquetes solicitados foron instalados con éxito."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problema durante a instalación"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1782,18 +1570,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Non é posible consegui-los paquetes fonte."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Non é posible consegui-los paquetes fonte, síntoo. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1805,38 +1592,34 @@ msgstr ""
 "Erro(s) comunicado(s):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalación de paquetes..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Iniciando..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalación de paquetes..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Cambia-lo soporte"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor insira o soporte chamado \"%s\" no dispositivo [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Descargando o paquete `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Verificando as sinaturas dos paquetes..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1850,13 +1633,12 @@ msgstr ""
 "\n"
 "Desexa continua-la instalación?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Fallo na instalación"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1868,23 +1650,21 @@ msgstr ""
 "\n"
 "Podería desexar actualizar a súa base de datos de soportes."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Preparando a instalación dos paquetes..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando o paquete `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "non foi posible acceder ó ficheiro rpm [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1896,43 +1676,33 @@ msgstr ""
 "Creáronse algúns ficheiros de configuración coma `.rpmnew' ou\n"
 "`.rpmsave', agora pode examinar algún deles para tomar medidas:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Estes paquetes veñen con información de actualización"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Máis información no paquete... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Non se atoparon paquetes para a instalación."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Erro sen solución: non se atopou o paquete para a súa instalación."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Agarde, lendo a base de datos de paquetes..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Agarde, eliminando paquetes..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problema durante a eliminación"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1942,8 +1712,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1955,8 +1724,8 @@ msgstr ""
 "Esta ferramenta axudaralle a escolle-lo software que desexa eliminar\n"
 "do seu ordenador."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1968,13 +1737,11 @@ msgstr ""
 "Esta ferramenta axudaralle a escolle-las actualizacións que desexa\n"
 "instalar no seu ordenador."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Benvid@ á ferramenta de instalación de software!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1988,214 +1755,172 @@ msgstr ""
 "software en CDROM ou DVD. Esta ferramenta axudaralle a escolle-lo\n"
 "software que desexa instalar no seu ordenador."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Actualización de Software"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Actualización de Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Actualización de Software"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Introduza as súas credenciais para acceder ó proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Nome de usuario:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Eliminación de Paquetes de Software"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Actualización de Paquetes de Software"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalación de Paquetes de Software"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Non"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Si"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Información..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Bélxica"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Suiza"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Alemaña"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "España"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Francia"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hungria"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Xapón"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Países Baixos"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwán"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2206,8 +1931,7 @@ msgstr ""
 "Verifique que a rede está activada e funcionando.\n"
 "Desexa continuar?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2219,25 +1943,28 @@ msgstr ""
 "Verifique que a rede está activada e funcionando.\n"
 "Desexa continuar?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "Eleccións de %s"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Agarde, descargando os enderezos dos sitios espello."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Por favor agarde, descargando os enderezos dos espellos dende o sitio web de "
 "Mandriva."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Erro durante a descarga"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2251,8 +1978,8 @@ msgstr ""
 "Pode ser que a rede ou o sitio web non estean dispoñibles.\n"
 "Inténteo de novo máis tarde."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2266,18 +1993,15 @@ msgstr ""
 "Pode ser que a rede ou o sitio web de Mandriva non estean dispoñibles.\n"
 "Por favor inténteo de novo máis tarde."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Non hai sitios espello"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Non se puido atopar ningún sitio espello axeitado."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2291,69 +2015,64 @@ msgstr ""
 "que a arquitectura do seu procesador non estea soportada polas\n"
 "Actualizacións Oficiais de Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Por favor escolla o espello que desexe."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinando o ficheiro do soporte `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinando o ficheiro remoto do soporte `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " feito."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " ¡fallou!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s dende o soporte %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Iniciando a descarga de `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Descarga de `%s', tempo restante:%s, velocidade:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Descarga de `%s', velocidade:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Por favor agarde, actualizando o soporte..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Erro ó recuperar os paquetes"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2368,36 +2087,31 @@ msgstr ""
 "volvelo engadir para volvelo configurar, ou pode ser que actualmente non\n"
 "estea dispoñible e debería intentalo máis tarde."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Actualiza-lo soporte"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Non se atopou ningún soporte activo. Debe habiliitar algún soporte para "
 "poder actualizalo."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Seleccione o soporte que quere actualizar:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2409,8 +2123,8 @@ msgstr ""
 "Erros:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2420,18 +2134,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Non foi posible crea-lo soporte."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Fallo ó engadi-lo soporte"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2441,8 +2153,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2452,8 +2164,8 @@ msgstr ""
 "s que está executando (%s).\n"
 "Vaise deshabilitar."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2463,13 +2175,11 @@ msgstr ""
 "Mandriva Linux que está executando (%s).\n"
 "Vaise deshabilitar."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "A axuda lanzouse en segundo plano"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "Xa se iniciou a fiestra de axuda, e amosarase en pouco tempo."
@@ -2743,3 +2453,15 @@ msgstr "Eliminar Software"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Xestor de Soportes de Software"
+
+#~ msgid "Stop"
+#~ msgstr "Parar"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Tódolos paquetes, por soporte"
+
+#~ msgid "Normal information"
+#~ msgstr "Información normal"
+
+#~ msgid "Maximum information"
+#~ msgstr "Información completa"
diff --git a/po/he.po b/po/he.po
index 4e1b71f5..8ae4de8a 100644
--- a/po/he.po
+++ b/po/he.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-07-09 23:26+0300\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <mdk-hebrew@iglu.org.il>\n"
@@ -24,13 +24,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "בחירת סוג מקור"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -54,18 +52,16 @@ msgstr ""
 "יהיה עליך\n"
 "להוסיף כל מקור בפעולה נפרדת.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "מקורות ההפצה"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "עדכונים רשמיים"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -83,104 +79,85 @@ msgstr ""
 "\n"
 "האם ניתן להמשיך?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "נא להמתין, מוסיף מקור..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "הוספת מקור"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "קבצים מקומיים"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "נתיב:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "שרת FTP"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "כתובת (URL):"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "שרת FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "שרת HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "התקן ניתן להסרה"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "נתיב או נקודת עיגון (mount point):"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "התקן ניתן להסרה"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "דפדוף..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "שם משתמש:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "הנתיב לקובץ synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "אם ריק, synthesis/hdlist ייבדק אוטומטית."
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "שם:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "יצירת מקור להפצה מלאה"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "חפש עדכונים במקור זה"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "עליך למלא לפחות את שתי הכניסות הראשונות."
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -188,13 +165,11 @@ msgstr ""
 "כבר יש מקור חבילות בשם זה, האם ברצונך \n"
 "להחליף אותו ?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "הוספת מקור:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "סוג המקור:"
 
@@ -202,10 +177,9 @@ msgstr "סוג המקור:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -214,101 +188,86 @@ msgstr "ביטול"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "אישור"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "אפשרויות כלליות להתקנת חבילות"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "תמיד"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "אף פעם"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "בדיקת חבילות שיותקנו"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "הורדת תוכנה לשימוש"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "הסרת מקור"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "האם ברצונך להסיר את המקור \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "נא להמתין בעת הסרת המקור..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "עריכת מקור"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "עריכת מקור \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "שמירת שינויים"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "שרת מתווך...."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "עליך להכניס את המדיה בכדי להמשיך."
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "בכדי לשמור את השינויים, עליך להכניס את המדיה אל הכונן."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "הגדרת שרתים מתווכים"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "הגדרות שרת מתווך למקור \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "הגדרות כלליות לשרת מתווך"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -317,166 +276,137 @@ msgstr ""
 "אופציונלית (תחביר:: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "שם המארח של השרת המתווך:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "באפשרותך לספק שם משתמש/סיסמה לצורך אימות בשרת המתווך:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "משתמש:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "הוסף קבוצה מקבילה"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "ערוך קבוצה מקבילה"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "הוספת הגבלת מקור"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "בחר מקור להוספה להגבלת המקורות:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "הוסף מארח"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "כתוב את שם המארח או כתובת IP להוספה:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "עריכת קבוצה מקבילית \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "שם קבוצה:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "פרוטוקול"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "הגבלת המקור:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "הוספה"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "הסרה"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "מארחים:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "הגדרת urpmi מקבילי (הרצה מבוזרת של urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "קבוצה"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "פרוטוקול"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "הגבלת מקור"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "פרוטוקול"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "פקודה"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(כלום)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "עריכה"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "הוספה..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "נהל מפתחות עבור חתימות דיגיטאליות של חבילות"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "מקור"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "מפתחות אימות"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "שם לא נמצא, המפתח לא נמצא ברשת המפתחות של RPM!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "הוספת מפתח"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "נא לבחור מפתח להוספה למקור %s."
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "הסרת מפתח"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -485,37 +415,31 @@ msgstr ""
 "(שם המפתח %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "הוספה מפתח..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "הסרת מפתח"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "הגדרת מקורות"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "מופעל?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "עדכונים?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -525,38 +449,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "הוספת ידנית..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "עדכון..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "ניהול מפתחות..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "מקבילי....."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "הגדרות כלליות"
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "עזרה"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -566,8 +484,7 @@ msgstr ""
 "\n"
 "האם להמשיך ?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -581,8 +498,7 @@ msgstr ""
 "ברצונך להשתמשבמחשב זה. מקורות אלו ישמשו להתקנת חבילות\n"
 "תוכנה חדשות או  על-מנת לעדכן את המערכת."
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -594,13 +510,22 @@ msgstr ""
 "נוסף או שולחן עבודה אחר, שגם בו הנך מתקין חבילות\n"
 "כלשהן?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "אין אפשרות להוסיף מקור זה, בשל נתונים שגויים ו/או חסרים"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"הוספת המקור '%s' תאפשר לך להתקין חבילות תוכנה\n"
+"חדשות למערכת שלך ממקור זה."
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -609,59 +534,56 @@ msgstr ""
 "הוספת המקור '%s' תאפשר לך להתקין חבילות תוכנה\n"
 "חדשות למערכת שלך ממקור זה."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "המקור '%s' נוסף בהצלחה."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "המקור '%s' נוסף בהצלחה."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "שימוש: %s [OPTION]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 "  --changelog-first      הצג את רשימת השינויים לפני רשימת הקבצים בחלון המידע"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     הגבל למקור הנתון"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     אחד את כל הקבצים שיימצאו מסוגl .rpmnew/.rpmsave"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=MODE            set mode (install (default), remove, update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      אל תשאל את שאלת האימות הראשונה בעת עדכון"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      אל תעדכן את המקור בעת ההפעלה"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        אל תבדוק את חתימות החבילות"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -669,33 +591,27 @@ msgstr ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    הצג רק חבילות אלו"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      בחר מראש חבילות אלו"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 אלץ הפעלה כמנהל מערכת"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           חפש חבילה מסויימת"
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "רץ במצב משתמש"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -705,634 +621,517 @@ msgstr ""
 "לא יתאפשר לך לבצע שינויים במערכת,\n"
 "אבל כן יתאפשר עיון במסד הנתונים הקיים."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "נגישות"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "כיווץ"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "גיבוי"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "צריבה"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "דחיסה"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "אחר"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "ספרים"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "ספרים על מחשוב"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "שאלות ותשובות"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "מדריכים"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "ספרות"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "אשכול"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "העברת הודעה"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "הכנסת שרותים לתור"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "תקשורת"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "בסיסי נתונים"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "פיתוח"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "פיתוח"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME ו-GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE ו-QT"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "גרעין"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "עורכים"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "חינוך"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "אמולטורים"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "כלי ניהול קבצים"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "משחקים"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "הרפתקאות"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "משחקים"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "משחקי Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "לוחות"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "קלפים"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "תצרף"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "ספורט"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "אסטרטגיה"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "שולחן עבודה גרפי"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "שולחן עבודה גרפי"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "מבוסס FVWM "
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "גרפיקה"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "בקרה"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "מולטימדיה"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "עבודה ברשת"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "צ'אט"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "עבודה ברשת"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "העברת קבצים"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "מסרים מיידים"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "דוא\"ל"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "חדשות"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "גישה מרחוק"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "משרד"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "מפתחות ציבוריים"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "פרסום"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "מדעים"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "אסטרונומיה"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "מדעים"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "ביולוגיה"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "כימיה"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "מדעי המחשב"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "מדעי כדוה\"א"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "מתמטיקה"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "פיזיקה"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "מסופים"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "שמע"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "מערכת"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "בסיס"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "הגדרות"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "מערכת"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "אתחול"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "הגדרות"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "חומרה"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "אריזה"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "הדפסה"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "פריסה"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "פריסה"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "גופנים"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "מסוף"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "גופנים"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "תמונת X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "בנאום"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "חומרה וגרעין"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "ספריות"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "שרתים"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "מסופים"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "כלי עיבוד טקסט"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "צעצועים"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "וידאו"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(לא-זמין)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "תוצאות חיפוש"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "תוצאות חיפוש (כלום)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "נא להמתין בעת החיפוש..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "עצור"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "ניתנות להוספה"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "ניתנות לשדרוג"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "ניתנות להוספה"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "לא מסומן"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "נבחרה"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "לא מסומן"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "חשיבות : "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "סיבת העדכון: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "ללא תיאור"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "קבצים:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "רשימת שינויים:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "מקור: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "הגרסה המותקנת כרגע: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "שם: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "גרסה: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "ארכיטקטורה: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "גודל : "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "חשיבות : "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "גודל : "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "סיכום: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "סיבת העדכון: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "תיאור: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "ללא תיאור"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "עוד מידע על החבילות..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "עליך לבחור"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "נדרשת אחת החבילות הבאות:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "עליך לבחור"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "נא להמתין בעת הכנת רשימת חבילות..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "לא לעדכן"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1342,29 +1141,24 @@ msgstr ""
 "אין עדכונים זמינים עבור החבילות המותקנות במחשבך,\n"
 "או שכבר התקנת את כל העדכונים."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "הכל"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "עוד מידע"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "מידע על החבילות"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "יש צורך להסיר מספר חבילות נוספות"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1373,13 +1167,11 @@ msgstr ""
 "יש להסיר את החבילה/ות הבאה/ות בשל התלויות שלהן:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "כמה חבילות לא יכלו להיות מוסרות"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1387,8 +1179,7 @@ msgstr ""
 "הסרת החבילות הבאות, תהרוס לך את המערכת. מצטער: \n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1398,13 +1189,11 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "חבילות נוספות שנדרש להתקין"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1414,18 +1203,17 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (שייך לרשימת דילוג)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "מספר חבילות לא ניתנות להתקנה"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1435,123 +1223,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "יש להסיר מספר חבילות"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "גודל נבחר : %d MB /מקום פנוי : %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "גודל נבחר: %d MB"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "אין תיאור זמין עבור חבילה זו\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "עדכוני אבטחה"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "עדכוני באגים"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "התקנה"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "עדכונים רגילים"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "התקנה"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s אפשרויות"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "חבילות מומלצות"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "כל החבילות, עפ\"י סדר האלף-בית"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "כל החבילות, לפי נושא"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "כל החבילות על פי זמינות עדכון"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "כל החבילות, לפי גודל"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "כל החבילות, לפי מחרוזת החיפוש"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "כל החבילות, לפי מקור תוכנה"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "כל החבילות על פי זמינות עדכון"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "עלים בלבד, ממוין עפ\"י תאריך התקנה"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "כל החבילות, לפי נושא"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "עדכונים רגילים"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "עדכוני באגים"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "עדכונים רגילים"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "עדכוני אבטחה"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "בשמות"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "בתיאורים"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "בשמות קבצים"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "מידע בסיסי"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "מידע מפורט"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "יש לבחור חבילות קודם"
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "נבחרו יותר מדי חבילות"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1567,7 +1340,7 @@ msgstr ""
 "האם אכן ברצונך להתקין את כל החבילות שבחרת ?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1581,89 +1354,100 @@ msgstr ""
 "\n"
 "הודעה זו עלולה להתקבל באם מוגדר מקור לא מתאים למערכת שלך. האם להמשיך ?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/_קובץ"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_עדכון מקורות"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_איפוס הבחירה"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/טעינה מחדש של _רשימת החבילות"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_יציאה"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/א_פשרויות"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/הראה חבילות שנבחרו באופן _אוטומטי"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_עזרה"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "עדכון Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "חיפוש:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "נקה"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "התקנה"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "שגיאה חמורה"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "שגיאה חמורה אירעה : %s."
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1675,13 +1459,12 @@ msgstr ""
 "\n"
 "האם ברצונך להמשיך?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "כבר קיים מקור לעדכונים"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1696,13 +1479,12 @@ msgstr ""
 "\n"
 "לאחר מכן עליך לאתחל את %s מחדש."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "איך לבחור את אתר המראה באופן ידני"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1716,58 +1498,56 @@ msgstr ""
 "\n"
 "לאחר מכן, יעליך להפעיל מחדש את %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "בוחן את %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "שינויים:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "הסרת .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "שימוש ב .%s כקובץ ראשי"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "לא לעשות כלום"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "ההתקנה הסתיימה"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "בחינה ...."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "התגלו בעיות תוך כדי ההתקנה "
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1777,18 +1557,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "לא יכול לקבל את חבילות המקור."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "לא יכול לקבל את חבילות המקור, מצטער. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1800,38 +1579,34 @@ msgstr ""
 "דו\"ח שגיאות:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "מתקין חבילות...."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "מאתחל..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "מתקין חבילות...."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "החלפת מדיה"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "עליך להכניס את המדיה בשם \"%s\" להתקן [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "מוריד את החבילה %s' (%s/%s)"
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "בודק את החתימות של החבילות..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1845,13 +1620,12 @@ msgstr ""
 "\n"
 "האם להמשיך את ההתקנה?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "התקנה נכשלה"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1863,23 +1637,22 @@ msgstr ""
 "\n"
 "יתכן שעליך לעדכן את בסיס הנתונים של מקורות התוכנה."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "מכין חבילות להתקנה..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "מתקין את %s (חבילה %s מתוך %s)"
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "אין אפשרות גישה לחבילת התוכנה [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1891,43 +1664,33 @@ msgstr ""
 "נוצרו מספר קבצי הגדרות בשם, `.rpmnew' או `.rpmsave'\n"
 "יש באפשרותך לעיין בהם בכדי להשלים את עדכון המערכת שלך:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "חבילות אלו מכילות מידע אודות שדרוג"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "עוד מידע על החבילה... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "לא נמצאה חבילה להתקנה"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "שגיאה חמורה: לא נמצא חבילה להתקנה, מצטער."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "נא להמתין בעת הסרת החבילות..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "בעיה בזמן ההסרה"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1937,8 +1700,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1949,8 +1711,8 @@ msgstr ""
 "\n"
 "כלי זה יאפשר לך להסיר חבילות מהמחשב שלך."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1961,13 +1723,11 @@ msgstr ""
 "\n"
 "כלי זה יעזור לך לעדכן את המחשב שלך."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "ברוך בואך לכלי התקנות התוכנה!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1981,214 +1741,172 @@ msgstr ""
 "תוכנה בתקליטור(ים) או ברשת. כלי זה יעזור לך לבחור\n"
 "חבילות תוכנה להתקנה במחשב שלך."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "עדכון חבילות תוכנה"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "עדכון Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "עדכון חבילות תוכנה"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "עליך להגדיר את פרטי ההתחברות לשרת המתווך\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "שם משתמש:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "הסרת חבילות תוכנה"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "עדכון חבילות תוכנה"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "התקנה של חבילות תוכנה."
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "לא"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "כן"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "מידע..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "אוסטריה"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "אוסטרליה"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "בלגיה"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "ברזיל"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "קנדה"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "שוייץ"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "קוסטה-ריקה"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "הרפובליקה הצ'כית"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "גרמניה"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "דנמרק"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "יוון"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "ספרד"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "פינלנד"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "צרפת"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "הונגריה"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "ישראל"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "איטליה"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "יפן"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "קוריאה"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "הולנד"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "נורווגיה"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "פולין"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "פורטוגל"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "רוסיה"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "שוודיה"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "סינגפור"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "סלובקיה"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "טיוואן"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "בריטניה"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "סין"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "ארה\"ב"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2200,8 +1918,7 @@ msgstr ""
 "\n"
 "האם ניתן להמשיך?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2213,23 +1930,26 @@ msgstr ""
 "\n"
 "האם ניתן להמשיך?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s אפשרויות"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr " נא להמתין, מוריד כתובות כתובות של אתרי מראה."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr " נא להמתין בעת הורדת כתובות אתרי מראה מאתר מנדריבה"
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "שגיאה בזמן הורדה"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2243,8 +1963,8 @@ msgstr ""
 "יתכן וחיבור הרשת, או האתר אליו התוכנה ניסתה להתחבר אינם זמינים.\n"
 "נא לנסות שוב מאוחר יותר."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2258,18 +1978,15 @@ msgstr ""
 "יתכן והרשת, או האתר של מנדריבה אינם זמינים.\n"
 "נא לנסות שוב מאוחר יותר."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "אין אתה מראה"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "לא נמצא אף אתר מראה מתאים."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2282,69 +1999,64 @@ msgstr ""
 "ישנן מספר סיבות אפשריות לבעיה זו; הנפוצה בהן היא שארכיטקטורת\n"
 "המעבד הראשי במחשב שלך לא נתמכת על-ידי העדכונים הרשמיים של Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "נא לבחור את אתר המראה אליו ברצונך להתחבר."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "העתקת קובץ עבור המקור `%s'.."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "בחינת קובץ ממקור `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "בחינת קובץ מרוחק במקור `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " סיום."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " נכשל!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s ממקור %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "מתחיל להוריד את %s..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "הורדה של `%s' במהירות: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "נא להמתין בעת עדכון המקור..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "חלה שגיאה בעת ייבוא החבילות"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2358,34 +2070,29 @@ msgstr ""
 "המקורות ולהוסיפו מחדש תוך הגדרתו כהלכה. ייתכן גם שמקור זה אינו\n"
 "זמין כרגע, ובמקרה זה עליך לנסות לעדכן את הרשימה מאוחר יותר."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "עדכון מקורות"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "נא לבחור את המקורות אותם ברצונך לעדכן:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "בחר הכל"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "עדכון"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2397,8 +2104,8 @@ msgstr ""
 "שגיאות:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2408,18 +2115,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "יצירת המקור נכשלה."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "חלה שגיאה בעת הוספת מקור"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2429,8 +2134,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2440,8 +2145,8 @@ msgstr ""
 "s).\n"
 "ולכן הוא ינוטרל."
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2451,13 +2156,11 @@ msgstr ""
 "במערכת זו (%s).\n"
 "לכן הוא ינוטרל."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "חלון העזרה נפתח ברקע"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "חלון העזרה יפתח עוד מעט של שולחן העבודה שלך"
@@ -2732,6 +2435,18 @@ msgstr "הסרת תוכנה"
 msgid "Software Media Manager"
 msgstr "מנהל מקורות תוכנה"
 
+#~ msgid "Stop"
+#~ msgstr "עצור"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "כל החבילות, לפי מקור תוכנה"
+
+#~ msgid "Normal information"
+#~ msgstr "מידע בסיסי"
+
+#~ msgid "Maximum information"
+#~ msgstr "מידע מפורט"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "הכל הותקן בצורה תקינה."
 
diff --git a/po/hi.po b/po/hi.po
index 7b69d784..b0a8b2a2 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-hi\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-08-21 15:37+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: Hindi, India\n"
@@ -15,13 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "माध्यम के प्रकार को चुनें"
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -43,18 +42,16 @@ msgstr ""
 "अधिकारिक अपडेटों को प्रदान करते है। (आप दोनों को भी जोड़ सकते है, परन्तु ऐसा करने के लिए\n"
 "आपको दो बार में इसे करना होगा ।)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "वितरण के स्रोत"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "अधिकारिक अपडेटस"
 
-#: ../edit-urpm-sources.pl:87
-#, c-format
+#: ../edit-urpm-sources.pl:88
+#, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -72,104 +69,85 @@ msgstr ""
 "\n"
 "क्या अब जारी रख्ना ठीक है?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "कृपया प्रतीक्षा करें, माध्यम को जोड़ा जा रहा है..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "एक माध्यम को जोड़े"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "स्थानीय संचिकाऐं"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "पथ:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "एफ़०टी०पी० सर्वर"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
 msgid "URL:"
 msgstr "यू०आर०एल०:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "एफ़०टी०पी० सर्वर"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "एच०टी०टी०पी० सर्वर"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "हटाने-योग्य साधन"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "पथ या आरोह बिन्दू:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "हटाने-योग्य साधन"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "देखें..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "संत्र-आरम्भ:"
 
-#: ../edit-urpm-sources.pl:180 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:129
-#, c-format
+#: ../edit-urpm-sources.pl:183 ../edit-urpm-sources.pl:479 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "कूट-शब्द:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
 msgid "Relative path to synthesis/hdlist:"
 msgstr "कृत्रिमता/हार्ड-डिस्क सूची के लिए सापेक्ष पथ:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "यदि खाली छोड़ दिया जाए, तो कॄत्रिमता/हार्डडिस्क सूची स्वतः ही परिक्षित होगी"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "नाम:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "एक सम्पूर्ण वितरण के लिए माध्यम का चयन"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "अपडेटों के लिए इस माध्यम में खोजें"
 
-#: ../edit-urpm-sources.pl:228
-#, c-format
+#: ../edit-urpm-sources.pl:224
 msgid "You need to fill up at least the two first entries."
 msgstr "आपको कम-से-कम प्रथम और द्वितीय प्रवीष्ठयों को भरना चाहिए।"
 
-#: ../edit-urpm-sources.pl:232
-#, c-format
+#: ../edit-urpm-sources.pl:228
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -177,13 +155,11 @@ msgstr ""
 "इस नाम का एक माध्यम पहले से विद्यमान है,\n"
 "क्या आप वास्तव में इसे बदलना चाहते है?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "एक माध्यम को जोड़े:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "माध्यम का प्रकार:"
 
@@ -191,10 +167,9 @@ msgstr "माध्यम का प्रकार:"
 #: ../edit-urpm-sources.pl:410 ../edit-urpm-sources.pl:435
 #: ../edit-urpm-sources.pl:496 ../edit-urpm-sources.pl:577
 #: ../edit-urpm-sources.pl:617 ../edit-urpm-sources.pl:675
-#: ../edit-urpm-sources.pl:814 ../rpmdrake:181 ../rpmdrake:727
-#: ../rpmdrake:1578 ../rpmdrake:1586 ../rpmdrake.pm:576 ../rpmdrake.pm:666
-#: ../rpmdrake.pm:739
-#, c-format
+#: ../edit-urpm-sources.pl:814 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:1675 ../rpmdrake:1683 ../rpmdrake.pm:280 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:682 ../rpmdrake.pm:755
 msgid "Cancel"
 msgstr "निरस्त"
 
@@ -203,101 +178,86 @@ msgstr "निरस्त"
 #: ../edit-urpm-sources.pl:574 ../edit-urpm-sources.pl:616
 #: ../edit-urpm-sources.pl:668 ../edit-urpm-sources.pl:740
 #: ../edit-urpm-sources.pl:807 ../edit-urpm-sources.pl:860
-#: ../edit-urpm-sources.pl:995 ../rpmdrake:181 ../rpmdrake:727 ../rpmdrake:744
-#: ../rpmdrake:749 ../rpmdrake:1512 ../rpmdrake:1578 ../rpmdrake:1729
-#: ../rpmdrake.pm:120 ../rpmdrake.pm:220 ../rpmdrake.pm:277 ../rpmdrake.pm:576
-#, c-format
+#: ../edit-urpm-sources.pl:1009 ../rpmdrake:191 ../rpmdrake:783
+#: ../rpmdrake:800 ../rpmdrake:805 ../rpmdrake:1606 ../rpmdrake:1675
+#: ../rpmdrake:1826 ../rpmdrake.pm:121 ../rpmdrake.pm:222 ../rpmdrake.pm:282
+#: ../rpmdrake.pm:592
 msgid "Ok"
 msgstr "ठीक"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "पैकेज संसाधन के लिए ग्लोबल विकल्प"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "सदैव"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "कभी नहीं"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "संसाधित किये जाने वाले आरपीएमो का सत्यापन:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "डॉउनलोड के लिए उपयोग किये जाने वाला प्रोग्राम:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "स्रोत को हटाना"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "क्या आप वास्तव में स्रोत \"%s\" को हटाना चाहते है?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "कॄपया प्रतिक्षा करें, माध्यम को हटाया जा रहा है..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "एक माध्यम को संपादित करें"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" माध्यम का संपादन किया जा रहा है:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "परिवर्तनों को सुरक्षित करें"
 
-#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:982
-#, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
 msgid "Proxy..."
 msgstr "प्रोक्सी..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "जारी रखने के लिए, आपको इस माध्यम को अन्दर डालना होगा"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "परिवर्तनों को सुरक्षित करने के लिए, आपको इस माध्यम को ड्राइव में डालना होगा।"
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "प्रोक्सियों की संरचना"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "\"%s\" माध्यम हेतु प्रोक्सी समायोजनायें"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "सार्वभौम प्रोक्सी समायोजनायें"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -306,140 +266,114 @@ msgstr ""
 "बतायेंनिर्देश वाक्य रचना:<प्रोक्सी होस्ट[:पोर्ट]> (syntax:<proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "प्रोक्सी होस्ट का नाम:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "आप को प्रोक्सी की प्रमाणिकता के लिए एक उपयोगकर्ता/कूट-शब्द को बताना होगा:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "उपयोगकर्ता:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "एक सामानान्तर समूह को जोड़े"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "एक समानान्तर समूह का संपादन करें"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "एक माध्यम की सीमा को जोड़े"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "मीडीया सीमा में जोड़ने के लिए, एक माध्यम का चयन करे:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "एक होस्ट को जोड़े"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "जोड़ने के लिए, होस्ट का नाम या आई०पी पता टाइप करें:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "\"%s\" सामान्तर समूह का संपादन किया जा रहा है:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "समूह का नाम:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "प्रोटोकाल"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "माध्यम सीमा:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "जोड़े"
 
 #: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
-#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:960 ../rpmdrake:1227
-#, c-format
+#: ../edit-urpm-sources.pl:720 ../edit-urpm-sources.pl:974
 msgid "Remove"
 msgstr "हटायें"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "होस्ट्स:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 "समानान्तर यू०आर०पी०एम०आई० को संरचनित करें (यू०आर०पी०एम०आई० का अलग-अलग निष्पादन)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "समूह"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "प्रोटोकाल"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "मीडीया सीमा"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "प्रोटोकाल"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "निर्देश"
 
-#: ../edit-urpm-sources.pl:704 ../rpmdrake:380 ../rpmdrake:404 ../rpmdrake:539
-#: ../rpmdrake:655
-#, c-format
+#: ../edit-urpm-sources.pl:704 ../rpmdrake:387 ../rpmdrake:411 ../rpmdrake:547
+#: ../rpmdrake:711
 msgid "(none)"
 msgstr "(कुछ नहीं)"
 
-#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:964
-#, c-format
+#: ../edit-urpm-sources.pl:724 ../edit-urpm-sources.pl:978
 msgid "Edit..."
 msgstr "सपांदन"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
 msgid "Add..."
 msgstr "जोड़े..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "पैकेजों के अंकीय हस्ताक्षरों के लिए, कुँजीयों का प्रबंधन करें"
 
-#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:895
-#, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
 msgid "Medium"
 msgstr "माध्यम"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -448,27 +382,24 @@ msgstr ""
 "कुँजीयां"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "कोई नाम नहीं मिला, कुँजी आर०पी०एम० की-रिंग में विद्यमान नहीं है!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "एक कुँजी जोड़े"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "%s माध्यम में जोड़ने के लिए, एक कुँजी का चयन करें"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "एक कुँजी को हटायें"
 
 #: ../edit-urpm-sources.pl:830
-#, c-format
+#, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -477,37 +408,31 @@ msgstr ""
 "(कुँजी का नाम: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "एक कुँजी जोड़े..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "कुँजी को हटायें"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "माध्यम संरचना"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "सक्रिय?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "सभी अपडेट?"
 
-#: ../edit-urpm-sources.pl:910
-#, c-format
+#: ../edit-urpm-sources.pl:924
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:940
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:954
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -517,38 +442,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "कस्टम जोड़े..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "अपडेट..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "कुँजीयों का प्रबंध करें..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "समानान्तर..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "ग्लोबल विकल्प..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "सहायता"
 
-#: ../edit-urpm-sources.pl:1007 ../gurpmi.addmedia:75 ../rpmdrake:1852
-#, c-format
+#: ../edit-urpm-sources.pl:1021 ../gurpmi.addmedia:97 ../rpmdrake:1901
+#, perl-format
 msgid ""
 "%s\n"
 "\n"
@@ -558,8 +477,7 @@ msgstr ""
 "\n"
 "क्या जारी रखना ठीक है?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -573,8 +491,7 @@ msgstr ""
 "उपयोग करना चाहते है। यह सभी, तब नये सॉफ़्टवेयर पैकेजों को संसाधित करने में या अपडेट्स\n"
 "को करने के लिए उपलब्ध होगें।"
 
-#: ../edit-urpm-sources.pl:1022
-#, c-format
+#: ../edit-urpm-sources.pl:1036
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -586,13 +503,22 @@ msgstr ""
 "दूसरे डेस्कटाप पर अन्य माध्यम प्रबंधक है, या आप वर्तमान में साथ-साथ\n"
 "पैकेजो को संसाधित कर रहे है?)"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "माध्यम को जोड़ने में असमर्थ, गलत या विलुप्त आर्गूमेन्टस"
 
-#: ../gurpmi.addmedia:78
-#, c-format
+#: ../gurpmi.addmedia:101
+#, fuzzy, perl-format
+msgid ""
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
+msgstr ""
+"आप अब एक नये पैकेजों के माध्यम `%s' को जोड़ने जा रहे है ।\n"
+"इसका अर्थ है कि आप अपने तंत्र में नये सॉफ़्टवेयर पैकेजों को इस नये माध्यम से जोड़ने में समर्थ होगें ।"
+
+#: ../gurpmi.addmedia:104
+#, perl-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
 "That means you will be able to add new software packages\n"
@@ -601,61 +527,58 @@ msgstr ""
 "आप अब एक नये पैकेजों के माध्यम `%s' को जोड़ने जा रहे है ।\n"
 "इसका अर्थ है कि आप अपने तंत्र में नये सॉफ़्टवेयर पैकेजों को इस नये माध्यम से जोड़ने में समर्थ होगें ।"
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "`%s' माध्यम को सफ़लतापूर्वक जोड़ा गया ।"
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "`%s' माध्यम को सफ़लतापूर्वक जोड़ा गया ।"
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "उपयोगिता: %s [विकल्पों का नाम]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 "  --changelog-first      विवरण खिड़की में फ़ाइलसूची के पहिले  परिवर्तनलॉग दिखाना"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     दिये गये माध्यम के लिए सीमा"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     सभी पायी गयी .rpmnew/.rpmsave फ़ाइलों के विलय के लिए "
 "प्रस्ताव"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            विधा को स्थापित करना (संसाधन (डिफ़ाल्ट), हटाना, अपडेट)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      अपडेट विधा में सबसे पहिले पुष्टि प्रश्न को ना पूछें"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "   --no-media-update       - शुरुवात में माध्यम को अपडेट ना करें"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm       पैकेजों के हस्ताक्षरों को सत्यापित ना करें"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -663,33 +586,27 @@ msgstr ""
 "  --parallel=alias,host  सामान्तर विधा में रहना, \"alias\" समूह का उपयोग करना, "
 "\"host\" मशीन को आश्रित्ताओं को दिखाने के लिए उपयोग करना"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    सिर्फ़ इन पैकेजों को दिखाएँ"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      इन पैकेजों को पहिले से चयन करें"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 रूट जैसे चलाने के लिए बाध्य करना"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           \"pkg\" के लिए खोज़ चलाना"
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "उपयोगकर्ता विधा में चलायमान"
 
-#: ../rpmdrake:179
-#, c-format
+#: ../rpmdrake:189
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -699,634 +616,517 @@ msgstr ""
 "आप इस प्रणाली पर परिवर्तनों को नहीं कर पायेगें,\n"
 "पर आप विद्यमान डाटाबेस को फ़िर भी देख सकते है।"
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "प्रवेश-योग्यता"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "पुरालेखण"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "बैक-अप"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "सी०डी० लेखन"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "संकुचन"
 
-#: ../rpmdrake:192 ../rpmdrake:197 ../rpmdrake:209 ../rpmdrake:220
-#: ../rpmdrake:229 ../rpmdrake:241 ../rpmdrake:253 ../rpmdrake:261
-#: ../rpmdrake:349
-#, c-format
+#: ../rpmdrake:202 ../rpmdrake:207 ../rpmdrake:219 ../rpmdrake:231
+#: ../rpmdrake:240 ../rpmdrake:252 ../rpmdrake:264 ../rpmdrake:272
+#: ../rpmdrake:356
 msgid "Other"
 msgstr "अन्य"
 
-#: ../rpmdrake:193 ../rpmdrake:194 ../rpmdrake:195 ../rpmdrake:196
-#: ../rpmdrake:197
-#, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
 msgid "Books"
 msgstr "पुस्तकें"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "कम्पूयटर पुस्तकें"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "बारम्बार पूछे जाने वाले प्रश्न"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "कैसे-करें"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "साहित्य"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "कलस्टर"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "संदेश आगे देना"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "कतार सेवायें"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "संचार"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "अनेक डाटाबेस"
 
-#: ../rpmdrake:202 ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205
-#: ../rpmdrake:206 ../rpmdrake:207 ../rpmdrake:208 ../rpmdrake:209
-#: ../rpmdrake:210 ../rpmdrake:211
-#, c-format
-msgid "Development"
-msgstr "विकास"
-
-#: ../rpmdrake:202
-#, c-format
+#: ../rpmdrake:212
 msgid "C"
 msgstr "सी०"
 
-#: ../rpmdrake:203
-#, c-format
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+msgid "Development"
+msgstr "विकास"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "सी०++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "जीनोम और जी०टी०के०+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "जावा"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "के०डी०ई० और क्यू०टी०"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "कर्नल"
 
-#: ../rpmdrake:210
-#, c-format
+#: ../rpmdrake:220
 msgid "Perl"
 msgstr "पर्ल"
 
-#: ../rpmdrake:211
-#, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
 msgid "Python"
 msgstr "पायथन"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "अनेक संपादक"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "शिक्षा"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "प्रतिस्पर्धक (एमयुलेटरस)"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "संचिका टूल्स"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "खेल"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "साहसिक कार्य"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "खेल"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "आरकेड"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "बोर्डस"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "कार्डस"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "पहेलियां"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "खेल-कूद"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "नीति"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "सचित्र डेस्कटाप"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "इनलाइटन-मेन्ट"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "सचित्र डेस्कटाप"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "एफ़०वी०डब्लू०एम० पर आधारित"
 
-#: ../rpmdrake:226
-#, c-format
+#: ../rpmdrake:237
 msgid "GNOME"
 msgstr "गनोम"
 
-#: ../rpmdrake:227
-#, c-format
+#: ../rpmdrake:238
 msgid "Icewm"
 msgstr "आईसीईडब्लूएम"
 
-#: ../rpmdrake:228
-#, c-format
+#: ../rpmdrake:239
 msgid "KDE"
 msgstr "के०डी०ई०"
 
-#: ../rpmdrake:230
-#, c-format
+#: ../rpmdrake:241
 msgid "Sawfish"
 msgstr "साफ़िस"
 
-#: ../rpmdrake:231
-#, c-format
+#: ../rpmdrake:242
 msgid "WindowMaker"
 msgstr "विंडोमेकर"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "लेखा-चित्र (ग्राफ़िक्स)"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "निर्देशन"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "मल्टीमीडिया"
 
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:260
-#, c-format
-msgid "Networking"
-msgstr "नेटवर्किंग"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "वार्तालाप"
 
-#: ../rpmdrake:236
-#, c-format
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
+msgstr "नेटवर्किंग"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "संचिका स्थानान्तरण"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "आई०आर०सी०"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "त्वरित संदेशवाहन"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "पत्र"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "समाचार"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "सुदूर पहुँच"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "डब्लू०डब्लू०डब्लू०"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "कार्यालय"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "सार्वजनिक कुँजियां"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "प्रकाशन"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "विज्ञान"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "खगोल विज्ञान"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "विज्ञान"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "जीव विज्ञान"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "रसायन विज्ञान"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "कम्पूयटर विज्ञान"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "भू-विज्ञान"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "गणित"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "भौतिक-विज्ञान"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "प्रकोष्ठ (सेल)"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "ध्वनि"
 
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264
-#: ../rpmdrake:265 ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268
-#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
-#: ../rpmdrake:273 ../rpmdrake:274
-#, c-format
-msgid "System"
-msgstr "प्रणाली"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "आधार"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "संरचना"
+#: ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274 ../rpmdrake:275
+#: ../rpmdrake:276 ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285
+msgid "System"
+msgstr "प्रणाली"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "बूट और इन्टि"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "संरचना"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "हार्डवेयर"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "पैकेजिंग"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "मुद्रण"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "डिप्लोईमेन्ट"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "डिप्लोईमेन्ट"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "फ़ोन्टस"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "कन्सोल"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "फ़ोन्टस"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "वास्तविक प्रकार (ट्रू टाइप)"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "प्रकार१"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 बिट मानचित्र"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "अंतर-राष्ट्रयीकरण "
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "कर्नल और हार्डवेयर"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "अनेक लेखागार"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "अनेक सर्वर"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "एक्सफ़्री-८६"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "टर्मिनल्स"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "टेक्टस टूल्स"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "खिलौने"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "वीडीओ"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(उपलब्ध नहीं है)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "खोज के परिणाम"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "खोज के परिणाम (कुछ नहीं)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "कृपया प्रतीक्षा करें, खोज जारी है..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "आरपीएमड्रैक"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "रूको"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "जोड़ने-योग्य"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "अपग्रेडेबल"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "जोड़ने-योग्य"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "चयन नहीं किया गया"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "चयन किया गया"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "चयन नहीं किया गया"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "महत्त्व: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "अपडेट करने का कारण: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "कोई वर्णन नहीं"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "सचिकाऐं:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "परिवर्तन रोजानामचा:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "माध्यम: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "वर्तमान संसाधित संस्मरण:  "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "नाम: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "संस्मरण: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "वास्तु:"
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "आकार: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s के०बी०"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "महत्त्व: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "आकार: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "सारांश: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "अपडेट करने का कारण: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "विवरण: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "कोई वर्णन नहीं"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "आरपीएमड्रैक"
 
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
+#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
+#: ../rpmdrake:671 ../rpmdrake:796 ../rpmdrake:798 ../rpmdrake:1816
 msgid "More information on package..."
 msgstr "पैकेज पर और ज्यादा सूचना..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "कृपया चयन करें"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "निम्नलिखित में से एक पैकेज की आवश्यकता है:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "कृपया चयन करें"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "कृपया प्रतीक्षा करें, पैकेजों की सूची को दिखाया जा रहा है..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "कोई अपडेट नहीं"
 
-#: ../rpmdrake:658
-#, c-format
+#: ../rpmdrake:714
 msgid ""
 "The list of updates is empty. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -1336,29 +1136,24 @@ msgstr ""
 "अपने कम्पूयटर पर संसाधित किया है, कोई अपडेट उपलब्ध नहीं है या आपने इन सभी\n"
 "को संसाधित कर लिया है।"
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "सभी"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:727 ../rpmdrake:732
-#, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
 msgid "More info"
 msgstr "और सूचना"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "पैकेजों के बारे में सूचना"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "कुछ अतिरिक्त पैकेजों को भी हटाना होगा"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1368,13 +1163,11 @@ msgstr ""
 "हटाना होगा:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "कुछ पैकेजों को हटाया नहीं जा सकता है"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1382,8 +1175,7 @@ msgstr ""
 "क्षमा करें, इन पैकेजों को हटाने से आपकी प्रणाली नष्ट हो जायेगी:\n"
 "\n"
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1393,13 +1185,11 @@ msgstr ""
 "अभी अचयनित किया जाना चाहिए:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "अतिरिक्त पैकेजों की आवश्यकता है"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1409,18 +1199,17 @@ msgstr ""
 "को भी संसाधित करना पड़ेगा:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (छोड़ी जाने वाली सूची में सम्मिलित है)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "कुछ पैकेजों को संसाधित नहीं किया जा सका"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1430,123 +1219,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "कुछ पैकेजों को हटाना चाहिए"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "चुना गया:  %d एम०बी० / मुक्त डिस्क स्थान: %d एम०बी०"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "चुना हुआ आकार: %d एम०बी०"
 
-#: ../rpmdrake:870
-#, c-format
+#. - related to the partial tree displaying hackery
+#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
+#: ../rpmdrake:926
 msgid "Description not available for this package\n"
 msgstr "इस पैकेज हेतु विवरण उपलब्ध नहीं है\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "सुरक्षा अपडेटस"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "दोष-निवारक अपडेटस"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "संसाधन"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "सामान्य अपडेटस"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "संसाधन"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s पसन्दें"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "मैनड्रिव की पसन्द"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "सभी पैकेज, वर्णमाला के क्रम में"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "सभी पैकेज, समूहों के क्रम में"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "सभी पैकेज, अपडेट की उपलब्धता पर आधारित"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "सभी पैकेज, आकार के क्रम में"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "सभी पैकेज, चयन अवस्था के क्रम में "
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "सभी पैकेज, माध्यम भन्डार के क्रम में"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "सभी पैकेज, अपडेट की उपलब्धता पर आधारित"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "सिर्फ़ लीवस, संसाधन तिथि के क्रम में "
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "सभी पैकेज, समूहों के क्रम में"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "सामान्य अपडेटस"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "दोष-निवारक अपडेटस"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "सामान्य अपडेटस"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "सुरक्षा अपडेटस"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "नामों में"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "विवरणों में"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "संचिका के नामों में"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "सामान्य जानकारी"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "सबसे ज्यादा जानकारी"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "आपको पहिले कुछ पैकेजों का चयन करना चाहिए।"
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "बहुत ज्यादा पैकेजों का चयन कर लिया गया है"
 
 #: ../rpmdrake:1104
-#, 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"
@@ -1563,7 +1337,7 @@ msgstr ""
 "क्या आप वास्तव में सभी चुनें हुए पैकेजों को संसाधित करना चाहते है?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1577,89 +1351,100 @@ msgstr ""
 "\n"
 "क्या जारी रखना ठीक है?"
 
-#: ../rpmdrake:1152 ../rpmdrake:1155 ../rpmdrake:1165 ../rpmdrake:1177
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1148 ../rpmdrake:1151 ../rpmdrake:1161 ../rpmdrake:1173
+#: ../rpmdrake:1179
 msgid "/_File"
 msgstr "/संचिका (_F)"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/माध्यम का अपडेट (_U)"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/चयन का रीसेट (_R)"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/पैकेजों की सूची का रीलोड (_p)"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/निर्गम(_Q)"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/विकल्प(_O)"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/स्वतः चयनित पैकेजों को दिखायें (_S)"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/सहायता(_H)"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr ""
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr ""
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr ""
+
+#: ../rpmdrake:1199
+#, fuzzy
+msgid "Mandriva Linux"
+msgstr "मैनड्रिव लिनक्स अपडेट"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:1204
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr ""
+
+#: ../rpmdrake:1228
 msgid "Find:"
 msgstr "प्राप्त:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "खोज"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "साफ़ करना "
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "संसाधन"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "निकास"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "घातक त्रुटि"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "एक घातक त्रुटि घटित हुई है: %s "
 
-#: ../rpmdrake:1286
-#, c-format
+#: ../rpmdrake:1314
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1671,13 +1456,12 @@ msgstr ""
 "\n"
 "क्या जारी रखना ठीक है?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "अपडेट किया हुआ माध्यम पहले से विद्यमान है"
 
-#: ../rpmdrake:1296
-#, c-format
+#: ../rpmdrake:1324
+#, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1693,13 +1477,12 @@ msgstr ""
 "\n"
 "इसके बाद, %s को पुनः आरम्भ करें।"
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "आपकी समरूप प्रणाली(mirror) को स्वंम कैसे चयन करें"
 
-#: ../rpmdrake:1307
-#, c-format
+#: ../rpmdrake:1335
+#, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1713,58 +1496,56 @@ msgstr ""
 "\n"
 "इसके बाद, %s को पुनः आरम्भ करें।"
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "कृपया प्रतीक्षा करें, उपलब्ध पैकेजों को पता लगाया जा रहा है..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "कृपया प्रतीक्षा करें, पैकेज डाटाबेस पढ़ा जा रहा है..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "%s की जाँच की जा रही है"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "परिवर्तन:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr ".%s को हटाये"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr ".%s को मुख्य संचिका की भांति उपयोग करें"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "कुछ नहीं करें"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "संसाधन समाप्त"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "जाँच की जा रही है..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "सभी निवेदित पैकेजों को सफ़लता-पूर्वक संसाधित किया गया।"
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "संसाधन के दौरान समस्या"
 
-#: ../rpmdrake:1542 ../rpmdrake:1686 ../rpmdrake:1746
-#, c-format
+#: ../rpmdrake:1636 ../rpmdrake:1783 ../rpmdrake:1843
+#, perl-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1774,18 +1555,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "स्रोत्र पैकेजों को प्राप्त करनें में असमर्थ"
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "स्रोत्र पैकेजों को प्राप्त करनें में असमर्थ, क्षमा करें। %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1797,38 +1577,34 @@ msgstr ""
 "त्रुटि(त्रुटियां) बतायी गई:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "पैकेज संसाधन..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "आरंभीकरण..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "पैकेज संसाधन..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "माध्यम परिवर्तित करें"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन प्रणाली (डिवाइस) में डालें"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) पैकेज को डॉउनलोड किया जा रहा है..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "पैकेजों के हस्ताक्षर प्रमाणित किये जा रहे है..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1842,13 +1618,12 @@ msgstr ""
 "\n"
 "क्या आप संसाधन जारी रख्ना चाहते है?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "संसाधन असफ़ल"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1860,23 +1635,22 @@ msgstr ""
 "\n"
 "आपको आपने मीडीया डाटाबेस को अपडेट करना चाहिए।"
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "पैकेजों के संसाधन की तैयारी की जा रही है..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "[%s] आरपीएम संचिका तक पहुँचने में असमर्थ"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1888,43 +1662,33 @@ msgstr ""
 "कुछ संरचना संचिकाओं का `.rpmnew' या `.rpmsave' की भांति निर्माण किया गया है,\n"
 "आप इनमें में कुछ का निरीक्षण, कार्यों को करने के लिए कर सकते है:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "ये पैकेज अपग्रेड सूचना के सहित आते है"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "पैकेज पर और अधिक सूचना... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "संसाधन के लिए कोई पैकेज नहीं मिला"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "असाध्य त्रुटि: संसाधन के लिए कोई पैकेज नहीं मिला, क्षमा करें।"
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "कृपया प्रतीक्षा करें, पैकेज डाटाबेस पढ़ा जा रहा है..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "कृपया प्रतीक्षा करें, पैकेज हटाये जा रहे है..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "हटाने के दौरान समस्या"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1934,8 +1698,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1947,8 +1710,8 @@ msgstr ""
 "यह टूल, उन सॉफ़्टवेयरों को चयन करने में आपकी मदद करेगा, \n"
 "जिन्हें आप अपने कम्पूयटर से हटाना चाहते है।"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1960,13 +1723,11 @@ msgstr ""
 "यह टूल, उन अपडेटस को चयन करने में आपकी मदद करेगा, \n"
 "जिन्हें आप अपने कम्पूयटर पर संसाधित करना चाहते है।"
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "सॉफ़्टवेयर संसाधन टूल में आपका स्वागत !"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1981,214 +1742,172 @@ msgstr ""
 "यह टूल, उन सॉफ़्टवेयरों को चयन करने में आपकी मदद करेगा, \n"
 "जिन्हें आप अपने कम्पूयटर पर संसाधित करना चाहते है।"
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "सॉफ़्टवेयर अपडेट"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "मैनड्रिव लिनक्स अपडेट"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "सॉफ़्टवेयर अपडेट"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "कृपया प्रोक्सी पर पहुँच पाने के लिए अपने अधिकार-पत्र बताएँ\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "उपयोगकर्ता नाम:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "सॉफ़्तवेयर पैकजों का निरस्तीकरण"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "सॉफ़्टवेयर पैकजों का अपडेट"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "सॉफ़्टवेयर पैकेजों का संसाधन"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "नहीं"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "हाँ"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "सूचना..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "आस्ट्रिया"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "आस्ट्रेलिया"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "बेल्जियम"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "ब्राज़ील"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "कनाडा"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "कोस्टारिका"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "ज़ेक रिपब्लिक"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "जर्मनी"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "डेनमार्क"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "ग्रीस"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "स्पेन"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "फ़िनलैण्ड"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "फ़्रांस"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "हंगरी"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "इजरायल"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "इटली"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "जापान"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "कोरिया"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "नीदरलैण्ड"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "नार्वे"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "पोलैण्ड"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "पुर्तगाल"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "सोवियत रूस"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "स्वीडन"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "ताईवान"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "ब्रिटेन"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "चीन"
 
-#: ../rpmdrake.pm:407 ../rpmdrake.pm:408 ../rpmdrake.pm:409 ../rpmdrake.pm:410
-#: ../rpmdrake.pm:490
-#, c-format
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:413 ../rpmdrake.pm:414 ../rpmdrake.pm:415
+#: ../rpmdrake.pm:504
 msgid "United States"
 msgstr "अमेरिका"
 
-#: ../rpmdrake.pm:505
-#, c-format
+#: ../rpmdrake.pm:518
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2200,8 +1919,7 @@ msgstr ""
 "\n"
 "क्या अब जारी रख्ना ठीक है?"
 
-#: ../rpmdrake.pm:509
-#, c-format
+#: ../rpmdrake.pm:522
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2213,25 +1931,28 @@ msgstr ""
 "\n"
 "क्या अब जारी रख्ना ठीक है?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s पसन्दें"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "कृपया प्रतीक्षा करें, मिरर पतों को डॉउनलोड किये जा रहे है। "
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "कृपया प्रतीक्षा करें, मैनड्रिव सॉफ़्ट वेब स्थल से समरूप प्रणालियों के पते डॉउनलोड किये जा रहे "
 "है। "
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "डॉउनलोड के दौरान त्रूटि"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2245,8 +1966,8 @@ msgstr ""
 "नेटवर्क या वेब-स्थल हो सकता है कि उपलब्ध ना हो।\n"
 "कृपया कुछ समय उपरान्त पुनः प्रयास करें।"
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2260,18 +1981,15 @@ msgstr ""
 "नेटवर्क या मैनड्रिव सॉफ़्ट वेब-स्थल हो सकता है कि उपलब्ध नहीं है।\n"
 "कृपया कुछ समय उपरान्त पुनः प्रयास करें।"
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "कोई समरूप प्रणाली उपलब्ध नहीं"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "मै किसी अनुरूप मिरर को नहीं खोज सका ।"
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2285,69 +2003,64 @@ msgstr ""
 "जब मैनड्रिव लिनक्स अधिकारिक अपडेटस , आपके संसाधक (प्रोसेसर) की संरचना को \n"
 "समर्थित नहीं करते हो।"
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "कृपया इच्छित समरूप प्रणाली का चयन करें।"
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' माध्यम के लिए संचिका की प्रतिलिपि बनाई जा रही है..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' माध्यम की संचिका का निरीक्षण हो रहा है..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' माध्यम की सूदूर संचिका का निरीक्षण किया जा रहा है..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr "किया गया।"
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr "असफ़ल!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, c-format
+#: ../rpmdrake.pm:652
+#, perl-format
 msgid "%s from medium %s"
 msgstr "%s माध्यम से %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' का डॉउनलोड आरम्भ हो रहा है..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' का डॉउनलोड, समय अनुमान:%s, गति:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' का डॉउनलोड, गति:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "कृपया प्रतीक्षा करें, माध्यम अपडेट किया जा रहा है..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "पैकेजों को पुनःप्राप्त करने में त्रुटि"
 
-#: ../rpmdrake.pm:686
-#, c-format
+#: ../rpmdrake.pm:702
+#, perl-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2363,34 +2076,29 @@ msgstr ""
 "या फ़िर वर्तमान में पहुँच से बाहर है और आपको कुछ समय पश्चात \n"
 "पुनः प्रयास करना चाहिए।"
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "माध्यम को अपडेट करें"
 
-#: ../rpmdrake.pm:722
-#, c-format
+#: ../rpmdrake.pm:738
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "उस माध्यम का चयन करें जिसे आप अपडेट करना चाहते है:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "सभी का चयन"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "अपडेट"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2402,8 +2110,8 @@ msgstr ""
 "त्रुटियां:\n"
 "%s"
 
-#: ../rpmdrake.pm:791 ../rpmdrake.pm:802
-#, c-format
+#: ../rpmdrake.pm:807 ../rpmdrake.pm:818
+#, perl-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2413,18 +2121,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "माध्यम का निर्माण करने में असमर्थ।"
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "असफ़लता जब माध्यम को जोड़ा जा रहा था..."
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2434,8 +2140,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:833
-#, c-format
+#: ../rpmdrake.pm:849
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2445,8 +2151,8 @@ msgstr ""
 "नहीं खाता है,  आप (%s) चला रहे है ।\n"
 "इसे निष्क्रिय कर दिया जायेगा ।"
 
-#: ../rpmdrake.pm:836
-#, c-format
+#: ../rpmdrake.pm:852
+#, perl-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2456,13 +2162,11 @@ msgstr ""
 "संस्मरण, जिसे आप चला रहे है (%s), के साथ मेल नहीं खा रहा है। \n"
 "इसे निष्क्रिय कर दिया जायेगा ।"
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "सहायता पृष्टभूमि में आरम्भ है"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "सहायता विंडो शुरू हो चुकी है, थोड़ी देर में यह आपकी डेस्कटाप पर दिखाई देगी।"
@@ -2737,6 +2441,18 @@ msgstr "सॉफ़्टवेयर निरस्तीकरण"
 msgid "Software Media Manager"
 msgstr "सॉफ़्टवेयर मीडीया प्रबंधक"
 
+#~ msgid "Stop"
+#~ msgstr "रूको"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "सभी पैकेज, माध्यम भन्डार के क्रम में"
+
+#~ msgid "Normal information"
+#~ msgstr "सामान्य जानकारी"
+
+#~ msgid "Maximum information"
+#~ msgstr "सबसे ज्यादा जानकारी"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "सबकुछ भली-भांति संसाधित किया गया"
 
diff --git a/po/hr.po b/po/hr.po
index 86982236..67eeaaa0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 0\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
 "PO-Revision-Date: 2005-01-04 21:27+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -15,13 +16,11 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:76
-#, c-format
+#: ../edit-urpm-sources.pl:77
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -35,18 +34,17 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:84
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:85
+#, fuzzy
 msgid "Official updates"
 msgstr "Normalne nadogradnje"
 
-#: ../edit-urpm-sources.pl:87
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:88
+#, fuzzy, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -61,106 +59,89 @@ msgstr ""
 "\n"
 "Može li se nastaviti?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Provjeravam ovisnosti..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Dodaj medij"