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"
 
-#: ../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 Poslužitelj"
 
-#: ../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 Poslužitelj"
 
-#: ../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 "Uklonjivi medij"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Putanja ili točka montiranja: "
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Uklonjivi medij"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Pregledaj..."
 
-#: ../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 "Lozinka:"
 
-#: ../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 "Relativna putanja 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 je prazno, synthesis/hdlis biti će automatski isproban"
 
-#: ../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 ""
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr ""
 "Molim odaberite izvore\n"
 "koje želite dograditi:"
 
-#: ../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?"
@@ -168,13 +149,11 @@ msgstr ""
 "Ondje je već medij sa tim imenom da li\n"
 "ga stvarno želite zamjeniti?"
 
-#: ../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:"
 
@@ -182,10 +161,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"
 
@@ -194,101 +172,88 @@ 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Pripremam se za instalaciju"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nikad"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Nisam u stanju instalirati paket"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Brisač izvora"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Da li stvarno želite obrisati izvor \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Molimo pričekajte, ukljanjam medij..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Promjeni medij"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Mijenjam medij \"%s\": "
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Pospremi promjene"
 
-#: ../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 "Trebate umetnuti medij 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 pospremiti promjene, trebate umetnuti medij u drive."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Podesi proxy-e"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxy postavke 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]>):"
@@ -296,166 +261,137 @@ msgstr ""
 "Ako trebate proxy, upišite ime hosta i porta (sintaksa: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy host ime:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Možete odrediti korisnika/lozinku za provjeru proxya:"
 
 #: ../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 "Mijenjaj paralelnu grupu"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Dodaj limit mediju"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Odaberite medij za dodavanje limita mediju:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Dodaj host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Upišite ime hosta ili IP adresu hosta koji se dodaje:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Promjeni 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 "Limit 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 "Ukloni"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Hostovi:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Podesi paralelni urpmi (distribuirana exekucija urpmia)"
 
 #: ../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 "Limit 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 "(nema)"
 
-#: ../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 "Promjeni..."
 
-#: ../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 digitalno potpisivanje 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 "nije pronađeno ime, ključ ne postoji u rpm šifriranju"
 
 #: ../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 "Odaberi ključ koje ćete dodati 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)"
@@ -464,75 +400,66 @@ 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 "Popis za uklanjanje"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Podesiti izvor?"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Aktivirano?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Nadogradi"
 
-#: ../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 "Dodaj..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Nadogradi"
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Upravljanje ključevima"
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralelno..."
 
-#: ../edit-urpm-sources.pl:984
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:998
+#, fuzzy
 msgid "Global options..."
 msgstr "Globalne proxy 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"
@@ -542,8 +469,7 @@ msgstr ""
 " \n"
 " Želite li nastaviti? "
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -559,8 +485,7 @@ msgstr ""
 "sofwareskog\n"
 "paketa ili da dogradi verzije."
 
-#: ../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"
@@ -568,102 +493,101 @@ 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 "Uporaba: %s [OPCIJE]..."
 
-#: ../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       - koristi samo medije za dogradnju.\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
-#, 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 "Pokrećem u korisničkom modu (user mode)"
 
-#: ../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"
@@ -673,669 +597,547 @@ msgstr ""
 "Nećete moći izvršiti promjene na sistemu,\n"
 "ali možete 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 "Sigurnosno spremanje"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Prženje CD-a"
 
-#: ../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 "Ostali"
 
-#: ../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 "Ostali"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Računalne knjige"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "FAQovi (ČPP)"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Uputstva Kako da (howto)"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../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 "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 "Razvojne nadogradnje"
-
-#: ../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 "Razvojne nadogradnje"
+
+#: ../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 "Japan"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "Razvojne nadogradnje"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "općenito"
 
-#: ../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 "Ažuriraj"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Komunikacije"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Datotečni alati"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Ime"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Avantura"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Ime"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkada"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Ploče"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Karte"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Slagalice"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Šport"
 
-#: ../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čka radna površina"
-
-#: ../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čka radna površina"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Baziran 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 "ali ne odgovara"
 
-#: ../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 "Kina"
 
-#: ../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 datoteka"
 
-#: ../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 "Brazil"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Diskusije"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Prenosivi medij"
 
-#: ../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 ""
 
-#: ../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 "Znanosti"
-
-#: ../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 "Znanosti"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kemija"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Računarska tehnika"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geologija"
 
-#: ../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 "Ljuske"
 
-#: ../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 "Sustav"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Baza"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Podesiti izvor?"
+#: ../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 "Sustav"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Boot i Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Podesiti izvor?"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Paketiranje"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Upozorenje"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Razvojne nadogradnje"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Razvojne nadogradnje"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Pisma"
-
-#: ../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 "Pisma"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "Tip"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Tip"
 
-#: ../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 "Poslužitelji"
 
-#: ../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 "Alati za tekst"
 
-#: ../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 "(Nije dostupno)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Rezultati pretraživanja"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Rezultati pretraživanja"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Molimo pričekajte dok rpm uklanja navedene pakete:"
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Zaustavljanje"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Može se dodati"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Nadogradi"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Može se dodati"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Nije odabrano"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr ""
 "Izaberi\n"
 "sve"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Nije odabrano"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Značaj: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Razlog za nadogradnju:"
+
+#. 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 "Zapisnik promjena:\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 "Sumarno"
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Razlog za nadogradnju:"
-
-#: ../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 odaberite"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Jedan od slijedeih paketa je potreban:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Molim odaberite"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr ""
 "Molimo pričekajte\n"
 "Sortiram pakete"
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Napravi Nadogradnje"
 
-#: ../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 "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 "Još informacija"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Izaberite vaše pakete"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr ""
 "Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi "
 "ispravno:"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1344,13 +1146,11 @@ msgstr ""
 "U pravilu da zadovoljite sve ovisnosti,\n"
 "slijedeći paketi biti će uklonjeni:\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Nisam u stanju instalirati paket"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1358,8 +1158,7 @@ msgstr ""
 "Micanje ovih paketa bi slomilo vaš sistem, žao mi je:\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"
@@ -1369,13 +1168,11 @@ msgstr ""
 "neodabran:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Potrebni dodatni paketi"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1385,18 +1182,17 @@ msgstr ""
 "biti instalirani:\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 "Nisam u stanju instalirati paket"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1406,123 +1202,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Neki paketi se moraju ukloniti"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Odabrano: %d MB / Slobodnog diskovnog prostora: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Veličina odabranih paketa: %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 "Prikaži sigurnosne nadogradnje"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Prikaži ispravke grešaka"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instaliraj"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normalne nadogradnje"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instaliraj"
 
-#: ../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 Dogradnja"
 
-#: ../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 "0 paketa, 0 byte-ova"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Svi paketi, po dostupnosti nadogradnje"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "0 paketa, 0 byte-ova"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Spremi odabir paketa"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
+#: ../rpmdrake:1010
+msgid "Leaves only, sorted by install date"
+msgstr "Ostavlja, poslaže po datumu instalacije"
+
+#: ../rpmdrake:1011
+msgid "All packages, by group"
 msgstr "0 paketa, 0 byte-ova"
 
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Svi paketi, po dostupnosti nadogradnje"
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normalne nadogradnje"
 
-#: ../rpmdrake:982
-#, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Ostavlja, poslaže po datumu instalacije"
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Prikaži ispravke grešaka"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normalne nadogradnje"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Prikaži sigurnosne nadogradnje"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "Ime domene"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "Opisi"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "Dajte ime datoteke"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "normalne dogradnje"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maksimalno informacija"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Izaberite vaše pakete"
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Paketa već instalirano"
 
 #: ../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"
@@ -1539,7 +1320,7 @@ msgstr ""
 "Želite li stvarno instalirati sve odabrane pakete"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1553,89 +1334,104 @@ msgstr ""
 "\n"
 "Da li je u redu 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
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Ažuriraj izvore"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Poništi odabir"
 
-#: ../rpmdrake:1177
-#, fuzzy, c-format
+#: ../rpmdrake:1173
+#, fuzzy
 msgid "/Reload the _packages list"
 msgstr "Izabir instaliranih 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 "/_Postavke"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, fuzzy, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
+#, fuzzy
 msgid "/_Show automatically selected packages"
 msgstr "Prikaži automatski odabrane pakete"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: ../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 "%s postavke"
+
+#. -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 "potraga"
 
-#: ../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 "Greška pri pisanju"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Nastupila je kobna pogreška: %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"
@@ -1647,13 +1443,12 @@ msgstr ""
 "\n"
 "Može li se nastaviti?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Provjeravam ovisnosti..."
 
-#: ../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"
@@ -1663,13 +1458,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Kako odabrati ručno vaš zrcalni poslužitelj"
 
-#: ../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"
@@ -1678,60 +1472,60 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Molimo pričekajte\n"
 "Sortiram pakete"
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr ""
+"Molimo pričekajte\n"
+"Sortiram pakete"
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Provjeravam %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "Paketi"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Ukloniti .%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 "ali ne odgovara"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalirano"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Provjera..."
 
-#: ../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 instalirani uspješno."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Dogodili su se problemi 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"
@@ -1741,18 +1535,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Izaberite vaše pakete"
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ne mogu dohvatiti pakete sa kodom. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1764,38 +1557,34 @@ msgstr ""
 "greške prijavljene:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Pripremam se za instalaciju"
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Instaliram:"
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Pripremam se za instalaciju"
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Promjeniti medij"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim umetnite medij pod nazivom \"%s\" u ureaj [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Preuzimanje paketa `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Provjera potpisa paketa..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1809,13 +1598,12 @@ msgstr ""
 "\n"
 "Želite li nastaviti sa instalacijom?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instaliraj sve"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1827,23 +1615,22 @@ msgstr ""
 "\n"
 "Možda bi trebali osvježiti vaš medij sa bazom podataka"
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Pripremam se za instalaciju"
 
-#: ../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"
@@ -1855,47 +1642,35 @@ msgstr ""
 "Neke konfiguracije su napravljene kao `.rpmnew' ili `.rpmsave',\n"
 "sada neke možete pregledati kako bi napravili:"
 
-#: ../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 "Izaberite vaše pakete"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Pripremam se za instalaciju"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Pripremam se za instalaciju"
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-"Molimo pričekajte\n"
-"Sortiram pakete"
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr ""
 "Molimo pričekajte\n"
 "Sortiram pakete"
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Dogodili su se problemi prilikom instalacije"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1905,8 +1680,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1918,8 +1692,8 @@ msgstr ""
 "Ovaj alat će vam pomoči u odabiru software-a kojeg želite ukloniti\n"
 "sa vašeg računala."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1927,13 +1701,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"
@@ -1942,214 +1714,176 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr " Upravitelj programima "
-
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
 msgid "Mandriva Linux Update"
 msgstr "%s postavke"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr " Upravitelj programima "
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Molimo unesite vašu lozinku za %s@%s:"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Korisničko ime:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr " Upravitelj programima "
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr " Upravitelj programima "
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Pripremam se za instalaciju"
 
-#: ../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 "Informacije..."
 
-#: ../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 "Switzerland"
 
-#: ../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 "Češka Republika"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Njemačka"
 
-#: ../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čka"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Španjolska"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Pronađi:"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Prisili"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Madžarska"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Instaliraj"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Instaliraj"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Prisili"
 
-#: ../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 "Port:"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Ruska"
 
-#: ../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 "Tajland"
 
-#: ../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 "Sjedinjene Američke Države"
 
-#: ../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"
@@ -2157,8 +1891,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"
@@ -2166,23 +1899,26 @@ 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 "Provjeravam ovisnosti..."
 
-#: ../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 "Greška tijekom preuzimanja paketa"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2191,8 +1927,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"
@@ -2201,18 +1937,15 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "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"
@@ -2221,71 +1954,66 @@ msgid ""
 "by Mandriva Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr ""
 "Molimo pričekajte\n"
 "Dohvaćam listu mirror-a"
 
-#: ../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 "Ispitivanje datoteke  sa medija `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ispitivanje udaljene datoteke sa medija `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " izvršeno."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr "Lokalno"
 
 #. -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činje preuzimanje datoteka `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Preuzimanje datoteke `%s',ostalo vremena:%s, brzina:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Preuzimanje datotekef `%s', brzina:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Provjeravam ovisnosti..."
 
-#: ../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"
@@ -2295,36 +2023,31 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Ažuriraj izvore"
 
-#: ../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 ""
 "Molim odaberite izvore\n"
 "koje želite dograditi:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Odaberite sve"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Nadogradi"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2336,26 +2059,24 @@ 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"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Ne mogu napraviti medij."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2365,29 +2086,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 "Pomoć 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 ""
@@ -2664,6 +2383,18 @@ msgstr "Ukloni software"
 msgid "Software Media Manager"
 msgstr "Upravitelj sesija"
 
+#~ msgid "Stop"
+#~ msgstr "Zaustavljanje"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "0 paketa, 0 byte-ova"
+
+#~ msgid "Normal information"
+#~ msgstr "normalne dogradnje"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maksimalno informacija"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "Paket je već instaliran"
 
diff --git a/po/hu.po b/po/hu.po
index 9b071556..97f2914b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,7 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hu\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 15:04+0100\n"
 "Last-Translator: Arpad Biro\n"
 "Language-Team: Hungarian\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 "Válasszon adatforrás-típust"
 
-#: ../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 ""
 "disztribúcióhoz. (Felvehet mindkét fajtából, ezt viszont két lépésben\n"
 "kell megtennie.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Disztribúcióforrások"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Hivatalos frissítések"
 
-#: ../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"
@@ -76,118 +73,97 @@ msgstr ""
 "\n"
 "Kívánja folytatni?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Adatforrások felvétele..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Adatforrás felvétele"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Helyi fájlok"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Útvonal:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP-kiszolgáló"
 
-#: ../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-kiszolgáló"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP-kiszolgáló"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Cserélhető eszköz"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Útvonal vagy csatolási pont:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Cserélhető eszköz"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Böngészés..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Felhasználónév:"
 
-#: ../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 "Jelszó:"
 
-#: ../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 "A kiterjesztett függőséglista illetve a fejléclista relatív elérési útja:"
+msgstr ""
+"A kiterjesztett függőséglista illetve a fejléclista relatív elérési útja:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 "Ha üresen van hagyva, akkor a kiterjesztett függőséglista illetve a "
 "fejléclista automatikusan lesz meghatározva"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Név:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Adatforrás létrehozása teljes disztribúcióhoz"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Frissítések keresése ezen adatforrásban"
 
-#: ../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 "Legalább az első két bejegyzést ki kell tölteni."
 
-#: ../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 "Már van ilyen néven adatforrás. Szeretné azt felülírni?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Adatforrás felvétele:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Az adatforrás típusa:"
 
@@ -195,10 +171,9 @@ msgstr "Az adatforrás típusa:"
 #: ../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 "Mégsem"
 
@@ -207,100 +182,87 @@ msgstr "Mégsem"
 #: ../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ális beállítások csomagtelepítéshez"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "mindig"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "soha"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "A telepítendő RPM-csomagok ellenőrzése:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "A használandó letöltőprogram:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Forrás eltávolítása"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Biztosan el kívánja távolítani a(z) \"%s\" forrást?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Az adatforrás eltávolítása folyamatban..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Adatforrás szerkesztése"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" adatforrás szerkesztése:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Módosítások mentése"
 
-#: ../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 "A folytatáshoz be kell helyeznie az adathordozót"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
-msgstr "A módosítások mentéséhez be kell helyeznie az adathordozót a meghajtóba."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr ""
+"A módosítások mentéséhez be kell helyeznie az adathordozót a meghajtóba."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Proxyk beállítása"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxybeállítások a(z) \"%s\" adatforráshoz"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globális proxybeállítások"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -309,166 +271,137 @@ msgstr ""
 "portszámát (formátum: <gépnév[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "A proxy gépneve:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "A proxyhoz szükséges felhasználónév és jelszó:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Felhasználó:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Párhuzamos csoport felvétele"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Párhuzamos csoport szerkesztése"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Adatforrás-korlát megadása"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Válassza ki az adatforrást, amelyhez korlátot kell rendelni:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Gép felvétele"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Adja meg a felveendő gép nevét vagy IP-címét:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "\"%s\" párhuzamos csoport szerkesztése:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Csoportnév:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Adatforrás-korlát:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Felvétel"
 
 #: ../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 "Eltávolítás"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Gépek:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Párhuzamos urpmi beállítása (az urpmi elosztott módú végrehajtása)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Csoport"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Adatforrás-korlát"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokoll"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Parancs"
 
-#: ../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 "(egyik sem)"
 
-#: ../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 "Módosítás..."
 
-#: ../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 "Felvétel..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "A csomagok digitális aláírási kulcsainak kezelése"
 
-#: ../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 "Adatforrás"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Kulcsok"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "név nem található, a kulcs nem létezik az RPM-kulcsok közt"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Kulcs felvétele"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Válassza ki a(z) %s adatforráshoz felveendő kulcsot"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Kulcs eltávolítása"
 
 #: ../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,39 +410,33 @@ msgstr ""
 "(a kulcs neve: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Kulcs felvétele..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Kulcs eltávolítása"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Adatforrások beállítása"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Engedélyezve?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Frissítések?"
 
-#: ../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 ""
 "Ezt az adatforrást frissíteni kell ahhoz, hogy használható legyen. Kívánja "
 "frissíteni most?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -519,38 +446,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Egyéni felvétel..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Frissítés..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Kulcsok kezelése..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Párhuzamos..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Globális beállítások..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Segítség"
 
-#: ../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 ""
 "\n"
 "Kívánja folytatni?"
 
-#: ../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 ""
 "Ezt követően a források felhasználásával új programokat telepíthet és\n"
 "frissítheti a meglevőket."
 
-#: ../edit-urpm-sources.pl: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,24 @@ msgstr ""
 "adatforrás-kezelőt egy másik munkaasztalon, vagy esetleg éppen\n"
 "csomagokat telepít)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
-msgstr "Nem sikerült felvenni az adatforrást - helytelen vagy hiányzó argumentumok"
+msgstr ""
+"Nem sikerült felvenni az adatforrást - helytelen vagy hiányzó argumentumok"
 
-#: ../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 ""
+"Egy új csomag-adatforrás ('%s') felvételére készül.\n"
+"Ez azt jelenti, hogy ebből az adatforrásból\n"
+"szoftvercsomagokat tud majd telepíteni a gépre."
+
+#: ../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,18 +534,22 @@ msgstr ""
 "Ez azt jelenti, hogy ebből az adatforrásból\n"
 "szoftvercsomagokat tud majd telepíteni a gépre."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "A(z) '%s' adatforrás felvétele megtörtént."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "A(z) '%s' adatforrás felvétele megtörtént."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Használat: %s [OPCIÓ]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -623,43 +557,39 @@ msgstr ""
 "  --changelog-first      a változáslista a fájllista előtt jelenjen meg a\n"
 "                         leírás-ablakban"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=adatf1,...     korlátozás a megadott adatforrásra"
 
-#: ../rpmdrake:38
-#, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+#: ../rpmdrake:41
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     a megtalált .rpmnew/.rpmsave fájlok felvételének\n"
 "                         felajánlása"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            üzemmód beállítása (install (telepítés - ez az\n"
 "                         alapértelmezett), remove (eltávolítás), update\n"
 "                         (frissítés))"
 
-#: ../rpmdrake:40
-#, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
-msgstr "  --no-confirmation      frissítési üzemmódban ne legyen megerősítéskérés"
+#: ../rpmdrake:43
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+"  --no-confirmation      frissítési üzemmódban ne legyen megerősítéskérés"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      adatforrás ne legyen frissítve indításkor"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        csomagaláírások ellenőrzésének elhagyása"
 
-#: ../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 +597,27 @@ msgstr ""
 "  --parallel=csop,gép    párhuzamos módban a megadott csoport és gép\n"
 "                         használata a szükséges függőségek megjelenítéséhez"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=csom1,...  csak a megadott csomagok megjelenítése"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=csomag1,...  a megadott csomagok előzetes kijelölése"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 rendszergazdaként (root) való futtatás"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=csomag        keresés indítása a megadott csomagra"
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Futtatás felhasználói üzemmódban"
 
-#: ../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,638 +627,521 @@ msgstr ""
 "Módosításokat nem fog tudni végrehajtani a rendszeren,\n"
 "viszont böngészheti a meglevő adatbázist."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Segédeszközök fogyatékosoknak"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archiválás"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Biztonsági mentés"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD-írás"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Tömörítőprogramok"
 
-#: ../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 "Egyéb"
 
-#: ../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 "Könyvek"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Számítástechnikai könyvek"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Gy.I.K. (FAQ) dokumentumok"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "HOGYAN-ok"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Irodalom"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Fürt"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Üzenetátadás"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Sorszolgáltatások"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Kommunikáció"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Adatbázisok"
 
-#: ../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 "Fejlesztés"
-
-#: ../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 "Fejlesztés"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME és GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE és 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 "Szövegszerkesztők"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Oktatás"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulátorok"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Fájlkezelő eszközök"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Játékok"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Kalandjátékok"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Játékok"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Ügyességi játékok"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Táblás játékok"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kártyajátékok"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Logikai játékok"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sportjátékok"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Stratégia"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Grafikus környezet"
-
-#: ../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 "Grafikus környezet"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM-alapú"
 
-#: ../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 "Monitorozás"
 
-#: ../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 "Hálózat"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Csevegés"
 
-#: ../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 "Hálózat"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Fájlátvitel"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Azonnali üzenetküldő program"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Levelezőprogramok"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Hírek"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Távoli elérés"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Irodai alkalmazások"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Nyilvános kulcsok"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publikálás"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Tudományok"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Csillagászat"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Tudományok"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biológia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kémia"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Számítástechnika"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Földrajz"
 
-#: ../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 "Parancsértelmezők"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Hang"
 
-#: ../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 "Rendszer"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Alap"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Beállítás"
+#: ../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 "Rendszer"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Indítás és inicializálás"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Beállítás"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Csomagoló"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Nyomtatás"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Telepítés"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Telepítés"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Betűtípusok"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konzol"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Betűtípusok"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "TrueType"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bittérkép"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Honosítás"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel és hardver"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Könyvtárak"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Kiszolgálók"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminálok"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Szövegkezelő eszközök"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Mütyürkék"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Videó"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Nem elérhető)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Keresési eredmény"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Keresési eredmény (nincs)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Keresés..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Leállítás"
-
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Upgradable"
-msgstr "Frissíthető"
-
 # "Addable" and "Upgradable": these are the two lists of packages when user selects
 # "by update availability"; the first lists the packages you can "add" to your computer
 # (new packages), the second lists the packages which are newer versions of already
 # installed packages
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Addable"
 msgstr "Telepíthető"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Selected"
-msgstr "Kijelölve"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Upgradable"
+msgstr "Frissíthető"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Not selected"
 msgstr "Nincs kijelölve"
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:531
+msgid "Selected"
+msgstr "Kijelölve"
+
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Fontosság: "
+
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "A frissítés oka: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Nincs leírás"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fájlok:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Változások jegyzéke:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Adatforrás: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "A jelenleg telepített verzió: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Név: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Verzió: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Architektúra: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Méret: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KByte"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Fontosság: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Méret: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Összefoglaló: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "A frissítés oka: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Leírás: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Nincs leírás"
+#. 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 "További információ a csomagról..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Válasszon"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Szükség van a következő csomagok valamelyikére:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Válasszon"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "A csomagok listázása folyamatban..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Frissítés nem található"
 
-#: ../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"
@@ -1344,29 +1151,24 @@ msgstr ""
 "gépére telepített csomagokhoz frissítés, vagy pedig már telepítve\n"
 "lett az összes."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Mind"
 
 #. -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 "További információ"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Információ a csomagokról"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Néhány további csomagot is el kell távolítani"
 
-#: ../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 ""
 "A függőségeik miatt a következő csomago(ka)t is el kell távolítani:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Bizonyos csomagok nem távolíthatók el"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1389,8 +1189,7 @@ msgstr ""
 "Ezen csomagok eltávolítása rendszerproblémákhoz vezetne:\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"
@@ -1399,13 +1198,11 @@ msgstr ""
 "A függőségeik miatt a következő csomag(ok) kijelölését törölni kell:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Szükség van további csomagokra"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1414,18 +1211,17 @@ msgstr ""
 "A függőségek miatt a következő csomago(ka)t is telepíteni kell:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (a kihagyandók listájához tartozik)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Bizonyos csomagok nem telepíthetők"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1435,128 +1231,113 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Bizonyos csomagokat el kell távolítani"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Kijelölve: %d MB / Üres hely a lemezen: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Kijelölve: %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 "Ehhez a csomaghoz nincs leírás\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Biztonsági frissítések"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Hibajavító frissítések"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Telepítés"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normál frissítések"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Telepítés"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s-válogatás"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-válogatás"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Az összes csomag, ábécérendben"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Az összes csomag, csoport szerint"
+# it's a sort method
+# "new or update"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Az összes csomag, frissítés elérhetősége alapján"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Az összes csomag, méret szerint"
 
 # it's a sort method
 # "selected or not"
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Az összes csomag, kijelölési állapot szerint"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Az összes csomag, adatforrás alapján"
-
-# it's a sort method
-# "new or update"
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Az összes csomag, frissítés elérhetősége alapján"
-
 # urpmi_rpm-find-leaves: returns the packages not required by any other package
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "A más által nem igényeltek, telepítési dátum szerint"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Az összes csomag, csoport szerint"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normál frissítések"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Hibajavító frissítések"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normál frissítések"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Biztonsági frissítések"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "a nevekben"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "a leírásokban"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "a fájlnevekben"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normál mennyiségű információ"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maximális mennyiségű információ"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Először ki kell jelölni néhány csomagot."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Túl sok csomag van kijelölve"
 
 #: ../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 +1353,7 @@ msgstr ""
 "Biztos abban, hogy telepíteni kívánja az összes kijelölt csomagot?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1587,89 +1368,100 @@ msgstr ""
 "\n"
 "Kívánja folytatni?"
 
-#: ../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ájl"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/Adatforrások _frissítése"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/A kijelölés _visszaállítása"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/A csomaglista újra_olvasása"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/Ki_lépés"
 
-#: ../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 "/_Beállítások"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Automatikusan kijelölt csomagok megjelenítése"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Segítség"
 
-#: ../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-frissítés"
+
+#. -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 "Keresés:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Keresés"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Törlés"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Telepítés"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Végzetes hiba"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Végzetes hiba történt: %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"
@@ -1681,13 +1473,12 @@ msgstr ""
 "\n"
 "Kívánja folytatni?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Már létező frissítési adatforrás"
 
-#: ../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"
@@ -1703,13 +1494,12 @@ msgstr ""
 "\n"
 "Ez után indítsa el újra a %s programot."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Hogyan lehet tükörkiszolgálót választani saját kezűleg"
 
-#: ../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"
@@ -1723,58 +1513,56 @@ msgstr ""
 "\n"
 "Ez után indítsa el újra a %s programot."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "A rendelkezésre álló csomagok lekérdezése..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Csomag-adatbázis olvasása..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "%s vizsgálata"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "módosítások:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr ".%s eltávolítása"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr ".%s használata főfájlként"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ne tegyen semmit"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "A telepítés befejeződött"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Vizsgálat..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Az összes kért csomag telepítve lett."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Probléma adódott a telepítés sorá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"
@@ -1784,18 +1572,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "A forráscsomagok letöltése sikertelen."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "A forráscsomagok letöltése sikertelen: %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1807,38 +1594,34 @@ msgstr ""
 "Hibaüzenetek:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Csomagtelepítés..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicializálás..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Csomagtelepítés..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Adatforrás váltása"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Helyezze be a(z) \"%s\" nevű adatforrást a(z) \"%s\" eszközbe"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "\"%s\" csomag letöltése (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "A csomag-aláírások ellenőrzése..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1852,13 +1635,12 @@ msgstr ""
 "\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "A telepítés sikertelen volt"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1870,23 +1652,21 @@ msgstr ""
 "\n"
 "Esetleg frissítse az adatforrás-adatbázist."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Csomagtelepítés előkészítése..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" csomag telepítése (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "\"%s\" RPM-csomagfájl nem elérhető"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1898,43 +1678,33 @@ msgstr ""
 "Létre lett hozva néhány beállítási fájl \".rpmnew\" vagy \".rpmsave\"\n"
 "néven; ha kívánja, tekintse meg a tartalmukat."
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Ezek a csomagok frissítési információt tartalmaznak"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "További információ a csomagról... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nincs telepíthető csomag."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Kijavíthatatlan hiba: nincs telepíthető csomag."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Csomag-adatbázis olvasása..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Csomagok eltávolítása folyamatban..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Probléma adódott az eltávolítás során"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1944,8 +1714,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1957,8 +1726,8 @@ msgstr ""
 "Ezzel a programmal kiválaszthatja, mely szoftvertermékeket kívánja\n"
 "eltávolítani a gépéről."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1970,13 +1739,11 @@ msgstr ""
 "Ezzel a programmal kiválaszthatja, mely frissítéseket kívánja\n"
 "telepíteni a gépére."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Üdvözli a szoftvertelepítő."
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1990,214 +1757,172 @@ msgstr ""
 "szoftvercsomagot tartalmaz. Ezzel a programmal kiválaszthatja,\n"
 "mely szoftvercsomagokat kívánja telepíteni a gépére."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Szoftverfrissítés"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux-frissítés"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Szoftverfrissítés"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Adja meg az adatait a proxy eléréséhez\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Felhasználónév:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Szoftvercsomag-eltávolítás"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Szoftvercsomag-frissítés"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Szoftvercsomag-telepítés"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nem"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Igen"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Információ..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Ausztria"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Ausztrália"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgium"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazília"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Svájc"
 
-#: ../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 "Cseh Köztársaság"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Németország"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Dánia"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Görögország"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spanyolország"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finnország"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Franciaország"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Magyarország"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Olaszország"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japán"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Hollandia"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvégia"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Lengyelország"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugália"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Oroszország"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Svédország"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Szingapúr"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Szlovákia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Egyesült Királyság"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Kí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 "Amerikai Egyesült Államok"
 
-#: ../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 +1934,7 @@ msgstr ""
 "\n"
 "Kívánja folytatni?"
 
-#: ../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 +1946,26 @@ msgstr ""
 "\n"
 "Kívánja folytatni?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s-válogatás"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "A tükörkiszolgálók listájának letöltése..."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "A tükörkiszolgálók listájának letöltése a Mandriva weboldaláról..."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Hiba a letöltés közben"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2252,8 +1979,8 @@ msgstr ""
 "Elképzelhető, hogy a hálózat vagy a weboldal nem\n"
 "elérhető. Próbálja meg később."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2267,18 +1994,15 @@ msgstr ""
 "Elképzelhető, hogy a hálózat vagy a Mandriva-weboldal nem\n"
 "elérhető. Próbálja meg később."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Tükörkiszolgáló nem található"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Nem található megfelelő tükörkiszolgáló."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2292,70 +2016,65 @@ msgstr ""
 "a hivatalos Mandriva Linux-frissítések nem támogatják az Ön\n"
 "gépében levő processzort."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Válassza ki a kívánt tükörkiszolgálót."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Az adatforráshoz tartozó fájl másolása: \"%s\"..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Az adatforráshoz tartozó fájl vizsgálata: \"%s\"..."
 
 # $label->set_label(N("Examining remote file of medium `%s'...", $file));
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Az adatforráshoz tartozó távoli fájl vizsgálata: \"%s\"..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " kész"
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " nem sikerült"
 
 #. -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 a következő adatforrásból: %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "\"%s\" letöltésének megkezdése..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "\"%s\" letöltése; hátralevő idő: %s; sebesség: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "\"%s\" letöltése; sebesség: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Az adatforrások frissítése folyamatban..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Hiba a csomagok letöltése közben"
 
-#: ../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,35 +2089,31 @@ msgstr ""
 "újrakonfigurálás érdekében; vagy pedig nem elérhető - ebben az esetben\n"
 "pedig próbálkozzon később."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Adatforrások frissítése"
 
-#: ../rpmdrake.pm:722
-#, c-format
-msgid "No active medium found. You must enable some media to be able to update them."
+#: ../rpmdrake.pm:738
+msgid ""
+"No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Nem található aktív adatforrás. Egy adatforrást engedélyeznie kell ahhoz, "
 "hogy frissíthesse azt."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Válassza ki, mely adatforrás(oka)t kívánja frissíteni:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Minden kijelölése"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Frissítés"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2410,8 +2125,8 @@ msgstr ""
 "Hibák:\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 +2136,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Az adatforrás létrehozása nem sikerült."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Nem sikerült felvenni az adatforrást"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2442,8 +2155,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 +2166,8 @@ msgstr ""
 "verziójának (%s).\n"
 "Az adatforrás ki lesz kapcsolva."
 
-#: ../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,15 +2177,15 @@ msgstr ""
 "Linux verziójának (%s).\n"
 "Az adatforrás ki lesz kapcsolva."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "A segítség elindítva a háttérben"
 
-#: ../rpmdrake.pm:853
-#, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
-msgstr "A segítség el lett indítva, hamarosan meg kell jelennie a munkaasztalon."
+#: ../rpmdrake.pm:870
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
+msgstr ""
+"A segítség el lett indítva, hamarosan meg kell jelennie a munkaasztalon."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -2744,3 +2457,14 @@ msgstr "Szoftvereltávolítás"
 msgid "Software Media Manager"
 msgstr "Szoftverforrás-kezelő"
 
+#~ msgid "Stop"
+#~ msgstr "Leállítás"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Az összes csomag, adatforrás alapján"
+
+#~ msgid "Normal information"
+#~ msgstr "Normál mennyiségű információ"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maximális mennyiségű információ"
diff --git a/po/hy.po b/po/hy.po
index 728c00a5..fc0758d7 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bootsplash 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: 2004-03-13 23:18+0300\n"
 "Last-Translator: Norayr Chilingaryan <norik@hay.am>\n"
 "Language-Team: hay.am <norik@hay.am>\n"
@@ -12,13 +13,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"
@@ -32,18 +31,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"
@@ -54,116 +51,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 ""
 
-#: ../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
-#, c-format
+#: ../edit-urpm-sources.pl:134
 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"
+#: ../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 ""
 
@@ -171,10 +146,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 "Հրաժարվել"
 
@@ -183,350 +157,293 @@ 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
-#, 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"
 "%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"
@@ -535,8 +452,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"
@@ -544,939 +460,791 @@ 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 ""
 
-#: ../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 "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 ""
 
-#: ../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"
+#: ../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 "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 ""
 
-#: ../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
-#, 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"
+#: ../rpmdrake:277
+msgid "Console"
 msgstr ""
 
-#: ../rpmdrake:266
-#, c-format
-msgid "Console"
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
 msgstr ""
 
-#: ../rpmdrake:267
-#, c-format
+#: ../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"
-msgstr ""
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
+#: ../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"
+#: ../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: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 ""
 
-#: ../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 ""
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
+#: ../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"
+#. 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"
+#: ../rpmdrake:1003
+msgid "Installed"
 msgstr ""
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
+#: ../rpmdrake:1003
+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
+msgid "All updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
-msgid "in names"
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1059
-#, c-format
-msgid "in descriptions"
+#: ../rpmdrake:1013
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:1061
-#, c-format
-msgid "in file names"
+#: ../rpmdrake:1013
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
+#: ../rpmdrake:1068
+msgid "in names"
 msgstr ""
 
 #: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
+msgid "in descriptions"
+msgstr ""
+
+#: ../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"
@@ -1487,7 +1255,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1496,89 +1264,99 @@ 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
-#, 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
+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"
+#: ../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"
@@ -1586,13 +1364,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"
@@ -1602,13 +1379,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"
@@ -1617,76 +1393,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"
@@ -1694,38 +1467,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"
@@ -1734,13 +1503,12 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../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"
@@ -1748,23 +1516,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"
@@ -1772,51 +1538,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"
@@ -1824,8 +1579,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1833,13 +1588,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"
@@ -1848,214 +1601,173 @@ 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
-#, c-format
+#: ../rpmdrake.pm:129
 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"
@@ -2063,8 +1775,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"
@@ -2072,23 +1783,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"
@@ -2097,8 +1810,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"
@@ -2107,18 +1820,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"
@@ -2127,69 +1837,64 @@ 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
-#, 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:656
+#, fuzzy, 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"
@@ -2199,34 +1904,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"
@@ -2234,55 +1934,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 ""
diff --git a/po/id.po b/po/id.po
index 2b798cde..9fbfa4b4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -16,7 +16,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-11-18 22:34+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -25,13 +26,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.6\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Pilih jenis 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"
@@ -56,18 +55,16 @@ msgstr ""
 "tapi Anda harus\n"
 "melakukanya dalam dua tahap.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Distribusi sumber (source)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Update resmi"
 
-#: ../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"
@@ -85,104 +82,84 @@ msgstr ""
 "\n"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Harap tunggu, menambahkan media..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Tambah sebuah media"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "File lokal"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Path:"
 
-#: ../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
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "Server RSYNC"
 
-#: ../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 "Perangkat portabel"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Path atau titik mount:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Perangkat portabel"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Jelajah..."
 
-#: ../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 "Katasandi:"
 
-#: ../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 "Path relatif terhadap sintesa/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Jika kosong, sintesa/hdlist akan dideteksi secara otomatis"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nama:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Buat media untuk semua distribusi"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Cari pada media ini untuk update"
 
-#: ../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 "Anda harus mengisi paling tidak dua entri pertama."
 
-#: ../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?"
@@ -190,13 +167,11 @@ msgstr ""
 "Sudah ada media dengan nama tersebut. Apakah Anda \n"
 "yakin akan menimpanya?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Penambahan sebuah media:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Jenis media:"
 
@@ -204,10 +179,9 @@ msgstr "Jenis 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 "Batal"
 
@@ -216,101 +190,86 @@ msgstr "Batal"
 #: ../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 "Opsi umum untuk installasi paket"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "selalu"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "tidak pernah"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifikasi RPM yang akan diinstall:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Download program untuk digunakan:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Penghapusan Sumber"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Apakah Anda yakin akan menghapus sumber \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Harap tunggu, menghapus media..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Edit sebuah media"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Mengedit media \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Simpan perubahan"
 
-#: ../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 "Anda harus memasukkan media untuk melanjutkan"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Untuk menyimpan perubahan, Anda harus memasukkan media ke dalam drive."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Konfigurasikan proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Setting proxy untuk media \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Setting global proxy"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -318,139 +277,113 @@ msgstr ""
 "Jika perlu proxy, masukkan nama host dan port (syntax: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Nama host proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Anda dapat menentukan pengguna/katasandi untuk otentikasi proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Pengguna:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Tambah grup parallel"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Edit grup parallel"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Tambah batas media"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Pilihlah media untuk ditambahkan pada batasan media:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Tambah sebuah host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Ketikkan nama atau alamat IP host yang akan ditambahkan:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Mengedit grup parallel \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nama grup:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Batas media:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Tambah"
 
 #: ../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 "Hapus"
 
 #: ../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 "Konfigurasikan urpmi parallel (eksekusi urpmi secara terdistribusi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grup"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Batasan media"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Perintah"
 
-#: ../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 "(tidak ada)"
 
-#: ../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..."
 
-#: ../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 "Tambah..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Mengelola kunci untuk tanda tangan digital paket"
 
-#: ../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"
@@ -459,27 +392,24 @@ msgstr ""
 "Kunci"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "Nama tidak ditemukan, kunci tidak ada dalam keyring RPM!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Tambah sebuah kunci"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Pilihlah kunci untuk ditambahkan pada media %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Hapus sebuah kunci"
 
 #: ../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)"
@@ -488,37 +418,31 @@ msgstr ""
 "(nama kunci : %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Menambah sebuah kunci..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Hapus kunci"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Konfigurasikan media"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Aktifkan?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 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 "Media ini perlu diupdate agar bisa digunakan. Update sekarang ?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -528,38 +452,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Tambah kustomisasi..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Update..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Mengelola kunci..."
 
-#: ../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 "Opsi umum..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../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"
@@ -569,8 +487,7 @@ msgstr ""
 "\n"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -584,8 +501,7 @@ msgstr ""
 "pakai pada komputer Anda, yang kemudian dapat digunakan untuk menginstal\n"
 "perangkat lunak baru atau melakukan proses update"
 
-#: ../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 +513,23 @@ msgstr ""
 "media pada desktop lain, atau Anda sedang menginstall\n"
 "paket juga?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Tidak dapat menambahkan media, kesalahan atau kekurangan argumen"
 
-#: ../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 ""
+"Anda hendak menambahkan media paket baru, `%s'.\n"
+"Ini berarti Anda bisa menambahkan paket perangkat lunak baru\n"
+"kedalam sistem Anda dari media baru."
+
+#: ../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 +539,22 @@ msgstr ""
 "Ini berarti Anda bisa menambahkan paket perangkat lunak baru\n"
 "kedalam sistem Anda dari media baru."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Penambahan media `%s' sukses."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Penambahan media `%s' sukses."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Pemakaian: %s [OPSI]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -632,45 +562,38 @@ msgstr ""
 "  --changelog-first      menampilkan changelog sebelum daftar file pada "
 "jendela deskripsi"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     batasi pada media yang diberikan"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     mengajukan penggabungan semua file .rpmnew/.rpmsave "
 "yang ditemukan"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            menentukan mode (install (default), hapus, update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      jangan tanya pertanyaan konfirmasi dalam mode update"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update       jangan update media saat di awal"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 "  --no-verify-rpm          tidak melakukan verifikasi tanda tangan paket"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -678,33 +601,27 @@ msgstr ""
 "  --parallel=alias,host  dalam mode parallel, gunakan grup \"alias\", "
 "gunakan \"host\" untuk menampilkan ketergantungan yang diperlukan"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    hanya menampilkan paket ini"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      pilih dahulu paket ini"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 paksa untuk dijalankan sebagai root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           jalankan pencarian untuk \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Jalankan dalam modus pengguna"
 
-#: ../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"
@@ -714,634 +631,517 @@ msgstr ""
 "Anda tidak akan dapat memodifikasi sistem, tapi tetap dapat\n"
 "menjelajah database yang ada."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Aksesibilitas"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Pengarsipan"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Pembakar CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Kompresi"
 
-#: ../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 "Lainnya"
 
-#: ../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 "Buku"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Buku komputer"
 
-#: ../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 "Literatur"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Kluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Pengiriman Pesan"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Antrian Layanan"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikasi"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Basis 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 "Pengembangan"
-
-#: ../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 "Pengembangan"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME dan GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE dan 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 "Editor"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Pendidikan"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulator"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Perkakas file"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Permainan"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Petualangan"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Permainan"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Papan"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kartu"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Teka-teki"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Olahraga"
 
-#: ../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 "Desktop grafis"
-
-#: ../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 grafis"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "berbasis 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 "Grafik"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Pemantauan"
 
-#: ../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 "Jaringan"
-
-#: ../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 "Jaringan"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transfer file"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Pesan instan"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Surat"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Berita"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Akses remote"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Kantor"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Kunci Publik"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Penerbitan"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Ilmu pengetahuan"
-
-#: ../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 "Ilmu pengetahuan"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kimia"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Ilmu komputer"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geosains"
 
-#: ../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"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Suara"
 
-#: ../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 "Dasar"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfigurasi"
+#: ../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 "Boot dan Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Perangkat keras"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pemaketan"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Pencetakan"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Pengembangan"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Pengembangan"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Font"
-
-#: ../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 "Font"
+
+#: ../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 "Internasionalisasi"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel dan perangkat keras"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Pustaka"
 
-#: ../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 "Terminal"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Perkakas teks"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Mainan"
 
-#: ../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 "(Tidak tersedia)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Hasil pencarian"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Hasil pencarian (tidak ada)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Harap tunggu, sedang dicari..."
 
-#: ../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 "Dapat ditambahkan"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Dapat di-upgrade"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Dapat ditambahkan"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Tidak terpilih"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Terpilih"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Tidak terpilih"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Tingkat Kepentingan: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Alasan untuk update: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Tidak ada deskripsi"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "File:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Media: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versi aktual yang terinstall: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nama: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versi: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arsitektur: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Ukuran: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Tingkat Kepentingan: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Ukuran: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Ringkasan: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Alasan untuk update: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Deskripsi: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Tidak ada deskripsi"
+#. 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 "Informasi tambahan pada paket..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Silahkan pilih"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Satu di antara paket berikut diperlukan:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Silahkan pilih"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Harap tunggu, paket sedang didaftar..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Tidak ada update"
 
-#: ../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,42 +1150,35 @@ msgstr ""
 "Daftar update kosong. Artinya tidak ada update untuk paket yang\n"
 "terinstall di komputer Anda, atau Anda sudah menginstallnya."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Semua"
 
 #. -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 "Info lain"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informasi pada paket"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Beberapa paket tambahan perlu dihapus"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
 "\n"
 msgstr "Untuk memenuhi dependensi, paket-paket berikut perlu dihapus:\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Beberapa paket tidak dapat dihapus"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1393,8 +1186,7 @@ msgstr ""
 "Maaf, menghapus paket ini berarti merusak sistem Anda:\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"
@@ -1403,31 +1195,28 @@ msgstr ""
 "Karena aspek ketergantungan, paket berikut harus tidak dipilih:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Dibutuhkan paket tambahan"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr "Untuk memenuhi ketergantungan, paket berikut juga harus diinstall:\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (milik daftar yang dilewati)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Beberapa paket tidak dapat diinstall"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1437,123 +1226,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Beberapa paket perlu dihapus"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Terpilih: %d MB / Ruang disk kosong: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Ukuran terpilih: %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 "Deskripsi tidak tersedia untuk paket ini\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Update keamanan"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Update bugfix"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Install"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Update normal"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Install"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s pilihan"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Pilihan 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 "Semua paket, menurut abjad"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Semua paket, menurut grup"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Semua paket, menurut ketersediaan update"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Semua paket, menurut ukuran"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Semua paket, menurut status pilihan"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Semua paket, menurut repositori media"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Semua paket, menurut ketersediaan update"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Cabang saja, diurutkan berdasarkan tanggal installasi"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Semua paket, menurut grup"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Update normal"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Update bugfix"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Update normal"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Update keamanan"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "dalam nama"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "dalam deskripsi"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "dalam nama file"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informasi normal"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Informasi maksimal"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Anda harus memilih beberapa paket dahulu."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Terlalu banyak paket yang dipilih"
 
 #: ../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 +1344,7 @@ msgstr ""
 "Benarkah Anda ingin menginstal semua paket terpilih?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1584,89 +1358,100 @@ msgstr ""
 "\n"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../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
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Update media"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Reset yang dipilih"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Reload daftar _paket"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Keluar"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "<control>Q"
 msgstr "<control>K"
 
-#: ../rpmdrake:1186 ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1182 ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Options"
 msgstr "/_Opsi"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Tunjukkan paket yang sudah dipilih secara otomatis"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/Ban_tuan"
 
-#: ../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 "Cari:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Cari"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Bersihkan"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Install"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Kesalahan fatal"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Kesalahan fatal terjadi: %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"
@@ -1678,13 +1463,12 @@ msgstr ""
 "\n"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Media update sudah ada"
 
-#: ../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"
@@ -1700,13 +1484,12 @@ msgstr ""
 "\n"
 "Lalu jalankan ulang %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Bagaimana memilih mirror secara manual"
 
-#: ../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"
@@ -1720,58 +1503,56 @@ msgstr ""
 "\n"
 "Lalu, jalankan ulang %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Harap tunggu, mencari paket yang tersedia..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Harap tunggu, membaca basis data paket..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Memeriksa %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "perubahan:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Hapus .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Gunakan .%s sebagai file utama"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Tidak lakukan apa-apa"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Installasi selesai"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Memeriksa..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Semua paket yang diminta telah sukses diinstall."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Masalah saat installasi"
 
-#: ../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"
@@ -1781,18 +1562,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Tidak dapat mendapatkan paket source."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Tidak dapat mendapatkan paket source. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1804,38 +1584,34 @@ msgstr ""
 "Kesalahan yang dilaporkan:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Installasi paket..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inisialisasi..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Installasi paket..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Ubah media"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Masukkan media \"%s\" ke divais [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Mendownload packet `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Memverifikasi tanda tangan paket..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1849,13 +1625,12 @@ msgstr ""
 "\n"
 "Apakah Anda hendak melanjutkan installasi?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Installasi gagal"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1867,23 +1642,21 @@ msgstr ""
 "\n"
 "Anda mungkin perlu meng-update basis data media."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Persiapan installasi paket..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Menginstall paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "tidak bisa mengakses file rpm [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1896,44 +1669,34 @@ msgstr ""
 "rpmsave',\n"
 "Anda mungkin perlu memeriksanya sekarang untuk bertindak selanjutnya:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Paket berikut datang dengan informasi upgrade"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Informasi tambahan pada paket... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Tidak ditemukan paket untuk installasi."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Kesalahan tidak terpulihkan: tidak ada paket yang ditemukan untuk installasi."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Harap tunggu, membaca basis data paket..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Harap tunggu, menghapus paket..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Masalah saat penghapusan"
 
-#: ../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 ""
 "Peralatan ini membantu Anda memilih perangkat lunak yang ingin Anda hapus\n"
 "dari komputer Anda."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1969,13 +1731,11 @@ msgstr ""
 "Perkakas ini membantu Anda memilih update yang ingin Anda install pada\n"
 "komputer Anda."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Selamat datang pada perkakas installasi perangkat lunak!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1990,214 +1750,172 @@ msgstr ""
 "yang\n"
 "hendak diinstall pada komputer Anda."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Update Perangkat Lunak"
-
-#: ../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 "Update Perangkat Lunak"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Silahkan masukkan kredensial Anda untuk mengakses proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Nama pengguna:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Penghapusan Paket Perangkat Lunak"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Update Paket Perangkat Lunak"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Installasi Paket Perangkat Lunak"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Tidak"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ya"
 
-#: ../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 "Belgia"
 
-#: ../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 "Swiss"
 
-#: ../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 Ceko"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Jerman"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Denmark"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Yunani"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spanyol"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Perancis"
 
-#: ../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 "Jepang"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Belanda"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polandia"
 
-#: ../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 "Swedia"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../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 "Inggris"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Cina"
 
-#: ../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 Serikat"
 
-#: ../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"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../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"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s pilihan"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Harap tunggu, mendownload alamat-alamat mirror."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Harap tunggu, mendownload alamat-alamat mirror dari website 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 "Kesalahan saat download"
 
-#: ../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 ""
 "Jaringan, atau website Mandriva mungkin tidak tersedia.\n"
 "Silakan coba lagi nanti."
 
-#: ../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 ""
 "Jaringan, atau website Mandriva mungkin tidak tersedia.\n"
 "Harap coba lagi nanti."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Tidak ada mirror"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Mirror yang cocok tidak dapat ditemukan."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2292,69 +2009,64 @@ msgstr ""
 "arsitektur\n"
 "prosesor Anda tidak didukung oleh Update Resmi Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Pilihlah mirror yang diinginkan."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Menyalin file untuk media `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Memeriksa file dari media `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Memeriksa file remote media `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " selesai."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " gagal!"
 
 #. -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 dari media %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Download `%s' dimulai..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download `%s', waktu yang dibutuhkan:%s, kecepatan:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download `%s', kecepatan:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Harap tunggu, mengupdate media..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Kesalahan menerima paket"
 
-#: ../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 ""
 "tersedia dan Anda harus mencoba\n"
 "ulang nanti."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Media update"
 
-#: ../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 ""
 "Tidak ada media aktif yang ditemukan. Anda harus mengaktifkan beberapa media "
 "untuk dapat mengupdatenya."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Pilih media yang ingin di-update:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Pilih semua"
 
-#: ../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"
@@ -2411,8 +2118,8 @@ msgstr ""
 "Kesalahan:\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 "Gagal membuat media."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Kesalahan ketika menambahkan media"
 
-#: ../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 ""
 "%s yang Anda jalankan (%s).\n"
 "Mediumnya akan di non-aktifkan."
 
-#: ../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 Linux yang Anda pakai (%s).\n"
 "Akan dinonaktifkan."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Bantuan diluncurkan di belakang"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2747,6 +2450,18 @@ msgstr "Hapus Perangkat Lunak"
 msgid "Software Media Manager"
 msgstr "Manajer Media Perangkat Lunak"
 
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Semua paket, menurut repositori media"
+
+#~ msgid "Normal information"
+#~ msgstr "Informasi normal"
+
+#~ msgid "Maximum information"
+#~ msgstr "Informasi maksimal"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "semua sudah diinstall dengan benar"
 
diff --git a/po/is.po b/po/is.po
index 81df2d4c..2048657e 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,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-04-02 09:14+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -16,13 +17,11 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\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 "Veldu tegund miðils"
 
-#: ../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,23 +38,21 @@ msgstr ""
 "spegli.\n"
 "\n"
 "Það eru tvær tegundir af opinberum speglum. Þú getur valið að bæta við\n"
-"miðli sem inniheldur alla pakkana í dreifingunni þinni (venjulega fleiri en\n "
-"þeir sem koma á geisladiskunum í stöðluðu dreifingunni), eða miðli\n"
+"miðli sem inniheldur alla pakkana í dreifingunni þinni (venjulega fleiri en\n"
+" þeir sem koma á geisladiskunum í stöðluðu dreifingunni), eða miðli\n"
 "sem inniheldur opinberar uppfærslur af dreifingunni þinni\n"
 "(Þú getur bætt báðum við, en þú verður að gera það í tvennu lagi)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Dreifingar-miðlar"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Opinberar uppfærslur"
 
-#: ../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"
@@ -73,104 +70,85 @@ msgstr ""
 "\n"
 "Er í lagi að halda áfram?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Augnablik, bæti við miðli..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Bæta við miðli"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Staðbundnar skrár"
 
-#: ../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 "FTP miðlari"
 
-#: ../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 "Slóð:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "RSYNC miðlari"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP miðlari"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Útskiptanlegt tæki"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Slóð eða tengipunktur:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Útskiptanlegt tæki"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Flakka..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Notandi:"
 
-#: ../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 "Lykilorð:"
 
-#: ../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 "Óbein slóð 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 "Ef skilið eftir autt, verður leitað að synthesis/hdlist á líklegum stöðum"
+msgstr ""
+"Ef skilið eftir autt, verður leitað að synthesis/hdlist á líklegum stöðum"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nafn:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Búa til miðil fyrir alla dreifinguna"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Leita í þessum miðli að uppfærslum"
 
-#: ../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 "þú verður að minnsta kosti að fylla í fyrstu tvö svæðin."
 
-#: ../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 +156,11 @@ msgstr ""
 "Það er nú þegar til miðill með þessu nafni, viltu\n"
 "skrifa yfir upplýsingar um hann?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Bæti við miðli:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tegund miðils:"
 
@@ -192,10 +168,9 @@ msgstr "Tegund miðils:"
 #: ../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 "Hætta við"
 
@@ -204,100 +179,86 @@ msgstr "Hætta við"
 #: ../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 "Í lagi"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Víðvær gildi fyrir innsetningu pakka"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "alltaf"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "aldrei"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Staðfesta RPM sem á að setja inn:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Niðurhalsforrit sem á að nota:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Fjarlægja miðil"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ertu vill um að þú viljir fjarlægja miðil \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Augnablik, fjarlægi miðil..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Sýsla með miðil"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Sýsla með miðil \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Vista breytingar"
 
-#: ../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 "Sel..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Þú verður að setja inn diskinn til að halda áfram"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "Til að vista breytingar, verður þú að setja miðilinn í drifið."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Stilla sel"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Sel-stillingar fyrir miðil \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Víðværar sel-stillingar"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -306,166 +267,137 @@ msgstr ""
 "[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Vélarnafn sels:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Þú getur sett notendanafn/lykilorð fyrir aðgang að seli:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Notandi:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Bæta við samhliða hóp"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Sýsla með samhliða hóp"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Bæta við miðilmörkum"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Veldu miðil til að bæta við að miðil-takmörkum:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Bæta við vél"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Sláðu inn nafn eða IP-tölu miðlara sem á að bæta við:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Sýsla með samhliða flokk \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nafn flokks:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Samskiptaregla:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Fjöldi miðlara:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Bæta við"
 
 #: ../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 "Fjarlægja"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Miðlarar:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Skilgreina samhliða urpmi (dreifð keyrsla á urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Flokkur"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Samskiptaregla"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Fjöldi miðlara"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Samskiptaregla"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Skipun"
 
-#: ../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 "(ekkert)"
 
-#: ../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 "Sýsl..."
 
-#: ../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 "Bæta við..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Sýsla með lykla fyrir stafrænar undirskriftir pakka"
 
-#: ../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 "Miðill"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Lyklar"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "nafn fannst ekki, lykill er ekki til á rpm lyklakippu!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Bæta við lykli"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Veldu lykil til að bæta við miðilinn %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Fjarlægja lykil"
 
 #: ../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)"
@@ -474,37 +406,32 @@ msgstr ""
 "(nafn lykils %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Bæta við lykli..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Fjarlægja lykil"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Bæta við miðli"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Virkur?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Uppfærslur?"
 
-#: ../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 "Það þarf að uppfæra þennan miðil svo hann sé nothæfur. Uppfæra hann núna?"
+msgstr ""
+"Það þarf að uppfæra þennan miðil svo hann sé nothæfur. Uppfæra hann núna?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -514,38 +441,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Bæta við sérsniðnu..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Uppfæra..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Sýsla með lykla..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Samhliða..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Víðværar stillingar..."
 
-#: ../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"
@@ -555,8 +476,7 @@ msgstr ""
 "\n"
 "Er í lagi að halda áfram?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -570,8 +490,7 @@ msgstr ""
 "þinni tölvu. Þeir verða þá tiltækir þegar setja á inn nýja pakka eða\n"
 "sækja uppfærslur."
 
-#: ../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 ""
 "sem eru að vinna með gagnagrunninn (Er annar pakkastjóri í\n"
 "gangi á skjáborðinu þínu, eða ertu að setja inn pakka annarstaðar?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Get ekki bætt við miðli, viðföng vantar eða þau eru röng"
 
-#: ../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 ""
+"Þú ert um það bil að bæta við nýjum pakkamiðli, `%s'.\n"
+"Það þýðir að þú munt geta bætt við nýjum hugbúnaðarpökkum\n"
+"frá þessum nýja miðli."
+
+#: ../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,18 +527,22 @@ msgstr ""
 "Það þýðir að þú munt geta bætt við nýjum hugbúnaðarpökkum\n"
 "frá þessum nýja miðli."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Tókst að bæta við miðli `%s'."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Tókst að bæta við miðli `%s'."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Notkun: %s [VALKOSTIR]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -617,40 +550,36 @@ msgstr ""
 "  --changelog-first      sýna breytingasögu á undan skráalista í "
 "lýsingarglugga"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=miðill1,..     takmarka við uppgefna miðla"
 
-#: ../rpmdrake:38
-#, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+#: ../rpmdrake:41
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
-"  --merge-all-rpmnew     Gera tillögu um að bræða saman allar .rpmnew/.rpmsave "
-"skrár sem finnast"
+"  --merge-all-rpmnew     Gera tillögu um að bræða saman allar .rpmnew/."
+"rpmsave skrár sem finnast"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr "  --mode=Hamur          setja ham (install (sjálfgefið), remove, update)"
+msgstr ""
+"  --mode=Hamur          setja ham (install (sjálfgefið), remove, update)"
 
-#: ../rpmdrake:40
-#, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+#: ../rpmdrake:43
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      ekki biðja um staðfestingu í uppfærsluham"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update       ekki uppfæra miðil við ræsingu"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        ekki staðfesta undiskriftir pakka"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -658,33 +587,27 @@ msgstr ""
 "  --parallel=alias,host  vera í samhliða ham, nota  \"alias\" hóp, nota "
 "\"host\" vél til að sýna pakka sem vantar"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    sýna aðeins þessa pakka"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      forvelja þessa pakka"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 þvinga keyrslu sem kerfisstjóri (root)"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pakka          leita að \"pakka\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Keyrir sem venjulegur notandi"
 
-#: ../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 ""
 "Þú munt ekki geta gert breytingar á kerfinu, en þú\n"
 "getur skoðað núverandi gagnagrunn pakka."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Aðgengi"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Skjölun"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Afrit"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Diskabrennsla"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Þjöppun"
 
-#: ../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 "Annað"
 
-#: ../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ækur"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Tölvubækur"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "SOS"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Hvernig á að"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Bókmenntir"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Safn"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Skeytasamskipti"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Biðraða-þjónustur"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Samskipti"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Gagnagrunnar"
 
-#: ../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 "Forritunartól"
-
-#: ../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 "Forritunartól"
+
+#: ../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 "Kjarni"
 
-#: ../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 "Ritlar"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Menntun"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Hermar"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Skráatól"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Leikir"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Ævintýri"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Leikir"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Spilasalur"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Borð"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Spil"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Þrautir"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Íþróttir"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Herkænska"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Grafískt skjáborð"
-
-#: ../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 "Grafískt skjáborð"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM grunnur"
 
-#: ../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 "Myndvinnsla"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Eftirlit"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Margmiðlun"
 
-#: ../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 "Netforrit"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Spjall"
 
-#: ../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 "Netforrit"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Skráaflutningur"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRK-ið"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Netspjallforrit"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Póstur"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Fréttir"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Fjarvinnsla"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Skrifstofuforrit"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Dreifilyklar"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Umbrot"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Vísindi"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Stjörnufræði"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Vísindi"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Líffræði"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Efnafræði"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Tölvufræði"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Jarðfræði"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Stærðfræði"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Eðlisfræði"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Skeljar"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Hljóð"
 
-#: ../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 "Kerfi"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Grunnur"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Stillingar"
+#: ../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 "Kerfi"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Ræsing og Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Stillingar"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Vélbúnaður"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakkastjórn"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Prentun"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Útgáfur"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Útgáfur"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Letur"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Skjától"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Letur"
+
+#: ../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 bitamynd"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Tungumál"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kjarni og vélbúnaður"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Undirforritasöfn"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Þjónustur"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Skjáhermar"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Textatól"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Leikföng"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Kvikmyndir"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Ekki til)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Leitarniðurstöður"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Leitarniðurstöður (engar)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Augnablik, leita..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stöðva"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Viðbætanlegt"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Uppfæranlegt"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Viðbætanlegt"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Ekki valið"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Valið"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Ekki valið"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Mikilvægi: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Ástæður fyrir uppfærslu: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Engin lýsing til"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Skrár:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Breytingasaga:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Miðill: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Núverandi uppsett útgáfa: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nafn: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Útgáfa: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Vélbúnaður: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Stærð: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Mikilvægi: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Stærð: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Yfirlit: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Ástæður fyrir uppfærslu: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Lýsing: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Engin lýsing til"
+#. 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 "Ítarlegri upplýsingar um pakka..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Vinsamlega veldu"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Vinsamlega veldu"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Augnablik, bý til pakkalista..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Engar uppfærslur"
 
-#: ../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 ""
 "fyrir þá pakka sem er uppsettir á tölvunni þinni, eða þú hefur\n"
 "þegar uppfært þá alla."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Allt"
 
 #. -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 "Nánari upplýs."
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Upplýsingar um pakka"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Það þarf að fjarlægja aðra pakka"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1362,13 +1163,11 @@ msgstr ""
 "Vegna árekstra , þarf að fjarlægja eftirfarandi pakka:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Ekki er hægt að fjarlægja suma pakkana"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1376,21 +1175,18 @@ msgstr ""
 "Því miður - ef þessir pakkar eru fjarlægðir verður stýrikerfið ónothæft:\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 "Vegna árekstra verður að af-velja eftirfarandi pakka núna:\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Aukapakkar sem þörf er á"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1399,18 +1195,17 @@ msgstr ""
 "Til að uppfylla kröfur þarf einnig að setja inn eftirfarandi pakka\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (tilheyrir sleppa listanum)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Ekki er hægt að setja inn suma pakkana"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1420,123 +1215,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Suma pakka þarf að fjarlægja"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valið: %d MB / Laust diskpláss: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Valin stærð %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 "Lýsing ekki tiltæk fyrir þennan pakka\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Öryggisuppfærslur"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Villuuppfærslur."
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Setja inn"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Venjulegar uppfærslur"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Setja inn"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s val"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux val"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Allir pakkar, í stafrófsröð"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Allir pakkar, eftir flokkum"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Allir pakkar, sem hægt er að uppfæra"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Allir pakkar, eftir stærð"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Allir pakkar, eftir valstöðu"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Allir pakkar, eftir miðli"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Allir pakkar, sem hægt er að uppfæra"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Aðeins afleiður, raðað eftir innsetningardegi"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Allir pakkar, eftir flokkum"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Venjulegar uppfærslur"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Villuuppfærslur."
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Venjulegar uppfærslur"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Öryggisuppfærslur"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "í nöfnum"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "í lýsingum"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "í skráanöfnum"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Venjulegar upplýsingar"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Hámarksupplýsingar"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Þú verður að velja einhverja pakka fyrst."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Of margir pakkar valdir"
 
 #: ../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 +1332,7 @@ msgstr ""
 "Ertu viss um að þú viljir setja inn alla valda pakka?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1566,89 +1346,100 @@ msgstr ""
 "\n"
 "Er í lagi að halda áfram?"
 
-#: ../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 "/_Skrá"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Uppfæra miðil"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/Endu_rstilla val"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Endurlesa _pakkalista"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Hætta"
 
-#: ../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 "/_Valkostir"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Sýna sjálfvirkt valda pakka"
 
-#: ../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 Uppfærsla"
+
+#. -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 "Leita:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Leita"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Hreinsa"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Setja inn"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Hætta"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Banvæn villa"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Banvæn villa kom upp: %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"
@@ -1660,13 +1451,12 @@ msgstr ""
 "\n"
 "Er í lagi að halda áfram?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Uppfærslumiðill þegar til"
 
-#: ../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 +1471,12 @@ msgstr ""
 "\n"
 "Endurræstu síðan %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Hvernig á að velja skráaspegli handvirkt"
 
-#: ../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 +1489,56 @@ msgstr ""
 "\n"
 "Endurræstu síðan %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Augnablik, leita að tiltækum pökkum..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Augnablik, les pakkagagnagrunn..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Athuga %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "breytingar:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Fjarlægja .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Nota %s sem aðalskrá"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Gera ekkert"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Innsetningu lokið"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Athuga..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Það gekk eðlilega að setja inn alla umbeðna pakka."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Vandræði við uppsetningu"
 
-#: ../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 +1548,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Get ekki sótt frumpakka."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Því miður get ég ekki sótt frumpakka, %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1784,38 +1570,34 @@ msgstr ""
 "Villur tilgreindar:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Pakka innsetning..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Frumstilli..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Pakka innsetning..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Breyta miðli"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vinsamlega setjið inn miðil nefndan \"%s\" í tæki [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Sæki pakka `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Staðfesti undirritanir pakka..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1829,13 +1611,12 @@ msgstr ""
 "\n"
 "Viltu halda áfram með uppsetninguna?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Innsetning mistókst"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1847,23 +1628,21 @@ msgstr ""
 "\n"
 "Þú ættir kannski að uppfæra gagnagrunn miðils."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Undirbý innsetningu pakka..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Set inn pakka `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "get ekki lesið rpm skrá [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1875,43 +1654,33 @@ msgstr ""
 "Nýjar skrár voru búnar til - nefndar `.rpmnew' eða `.rpmsave',\n"
 "þú ættir nú að yfirfara þessar skrár til að athuga hvort þörf sé á aðgerðum:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Þessir pakkar koma með uppfærsluupplýsingum"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Ítarlegri upplýsingar um pakka... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Enginn pakki fannst til uppsetningar."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Alvarleg villa: engir pakkar fundust til að setja upp."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Augnablik, les pakkagagnagrunn..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Augnablik, fjarlægi pakka..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Vandræði við að fjarlægja pakka"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1921,8 +1690,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1934,8 +1702,8 @@ msgstr ""
 "Þetta tól hjálpar þér til að velja þá pakka sem þú vilt fjarlægja\n"
 "úr tölvunni."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1947,13 +1715,11 @@ msgstr ""
 "Þetta tól hjálpar þér við að velja þær uppfærslur sem þú vilt setja upp\n"
 "á tölvunni þinni."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Velkomin(n) að hugbúnaðar-uppsetningar-tólinu!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1967,214 +1733,172 @@ msgstr ""
 "á geisladiskum eða DVD-diski. Þetta tól hjálpar þér að velja hvaða\n"
 "pakka þú vilt setja upp á tölvunni þinni."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Hugbúnaðar Uppfærsla"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Uppfærsla"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Hugbúnaðar Uppfærsla"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Vinsamlega gefðu upp aðgangs-auðkenni þitt fyrir vefsel\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Notandanafn:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Fjarlægja uppsetta pakka"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Uppfæra uppsetta pakka"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Uppsetning hugbúnaðarpakka"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nei"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Já"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Upplýsingar..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Austurríki"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Ástralía"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgía"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasilía"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Sviss"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Kosta Ríka"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Tékkland"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Þýskaland"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danmörk"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grikkland"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spánn"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finnland"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Frakkland"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ungverjaland"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Ísrael"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Ítalía"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Kórea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Noregur"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Pólland"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portúgal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rússland"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Svíþjóð"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapúr"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slóvakía"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Tævan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Stóra Bretland"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Kí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 "Bandaríkin"
 
-#: ../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"
@@ -2186,8 +1910,7 @@ msgstr ""
 "\n"
 "Er í lagi að halda áfram?"
 
-#: ../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"
@@ -2199,23 +1922,26 @@ msgstr ""
 "\n"
 "Er í lagi að halda áfram?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s val"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Augnablik, sæki upplýsingar um netföng spegla."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Augnablik, sæki upplýsingar um netföng spegla frá Mandriva vefnum."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Villa við að sækja upplýsingar"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2229,8 +1955,8 @@ msgstr ""
 "Netið eða vefsíðan er ekki tiltæk í augnablikinu.\n"
 "vinsamlega reynið síðar."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2244,18 +1970,15 @@ msgstr ""
 "Netið eða Mandriva vefsíðan er ekki tiltæk í augnablikinu.\n"
 "vinsamlega reynið síðar."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Enginn spegill"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Ég get ekki fundið nothæfan skráaspegil."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2269,69 +1992,64 @@ msgstr ""
 "þær vegna þess að vélbúnaður þinn er ekki studdur af opinberum\n"
 "uppsetningum Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Vinsamlega veldu æskilegan spegil."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Afrita skrá fyrir miðil `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Athuga skrá á miðli `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Athuga fjarlæga skrá fyrir miðil `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " lokið."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " mistókst!"
 
 #. -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 frá miðli %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Byrja að sækja `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Sæki `%s', tími eftir:%s, hraði:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Sæki `%s', hraði:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Augnablik, uppfæri miðil..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Villa við að sækja pakka"
 
-#: ../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,35 +2064,31 @@ msgstr ""
 "honum við aftur, til að endurstilla hann, eða hann er ekki tiltækur\n"
 "í augnablikinu og þú ættir að reyna síðar."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Uppfæra miðil"
 
-#: ../rpmdrake.pm:722
-#, c-format
-msgid "No active medium found. You must enable some media to be able to update them."
+#: ../rpmdrake.pm:738
+msgid ""
+"No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Engur virkur miðill fannst. Þú verður að virkja einhverja miðla til að geta "
 "uppfært þá."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Veldu miðil sem þú vilt uppfæra:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Velja allt"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Uppfæra"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2386,8 +2100,8 @@ msgstr ""
 "Villur:\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 +2111,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Gat ekki búið til miðil."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Villa þegar miðli var bætt við"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2418,8 +2130,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,25 +2141,24 @@ msgstr ""
 "af %s sem þú ert að nota (%s).\n"
 "Hann verður aftengdur."
 
-#: ../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 ""
-"Miðillinn `%s', sem notaður er fyrir uppfærslur, passar ekki fyrir þá útgáfu af "
-"Mandriva Linux sem þú ert að nota (%s).\n"
+"Miðillinn `%s', sem notaður er fyrir uppfærslur, passar ekki fyrir þá útgáfu "
+"af Mandriva Linux sem þú ert að nota (%s).\n"
 "Hann verður aftengdur."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Hjálp ræst í bakgrunni"
 
-#: ../rpmdrake.pm:853
-#, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
+#: ../rpmdrake.pm:870
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr ""
 "Hjálpargluggi hefur verið ræstur, hann ætti að birtast eftir augnablik á "
 "skjáborðinu."
@@ -2722,3 +2433,14 @@ msgstr "Fjarlægja hugbúnað"
 msgid "Software Media Manager"
 msgstr "Hugbúnaðar-miðla-tól"
 
+#~ msgid "Stop"
+#~ msgstr "Stöðva"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Allir pakkar, eftir miðli"
+
+#~ msgid "Normal information"
+#~ msgstr "Venjulegar upplýsingar"
+
+#~ msgid "Maximum information"
+#~ msgstr "Hámarksupplýsingar"
diff --git a/po/it.po b/po/it.po
index f2b009a2..8d216dd7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-it\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: 2006-01-14 22:47+0100\n"
 "Last-Translator: Andrea Celli <a.celli@caltanet.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -26,13 +26,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 "Scegli il tipo di supporto"
 
-#: ../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 +53,16 @@ msgstr ""
 "distribuzione. \n"
 " (Puoi aggiungerli entrambi, ma devi farlo in due occasioni.) "
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Supporti della Distribuzione"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Aggiornamenti ufficiali"
 
-#: ../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,86 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Attendere, aggiornamento dei supporti in corso..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Aggiungi un supporto"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "File locali"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Percorso:"
 
-#: ../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 "Dispositivo rimovibile"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Percorso o punto di mount:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Dispositivo rimovibile"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Sfoglia..."
 
-#: ../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 "Percorso relativo 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 lasciato vuoto, synthesis/hdlist verrà cercato automaticamente"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nome:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Crea un supporto per l'intera distribuzione"
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Seleziona i supporti che vuoi aggiornare:"
 
-#: ../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 "Devi compilare almeno i primi due campi."
 
-#: ../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 +166,11 @@ msgstr ""
 "C'è già un supporto con quel nome, vuoi\n"
 "veramente sostituirlo?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Aggiunta di un supporto:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tipo di supporto:"
 
@@ -202,10 +178,9 @@ msgstr "Tipo di supporto:"
 #: ../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 "Annulla"
 
@@ -214,101 +189,86 @@ msgstr "Annulla"
 #: ../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 "Opzioni globali per l'installazione dei pacchetti"
 
 #: ../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 gli RPM da installare"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Programma per eseguire il download:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Rimozione Supporto"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Vuoi davvero rimuovere il supporto \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Attendere, è in corso la rimozione del supporto..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Modifica un supporto"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Modifica supporto \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Salva le modifiche"
 
-#: ../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 "Inserisci il supporto per continuare"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Inserire il supporto nel lettore per salvare le modifiche."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Configurazione del proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Parametri Proxy per il supporto \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Parametri globali per il proxy"
 
 #: ../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 +277,138 @@ msgstr ""
 "(sintassi: <nomeproxy[:porta]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Nome host del proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Puoi specificare nome utente e password per l'autenticazione sul proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Utente:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Aggiungi un gruppo parallelo"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Modifica un gruppo parallelo"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Aggiunta supporto nel limite"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Scegli un supporto da aggiungere nel limite:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Aggiungi un host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Inserisci il nome o l'indirizzo IP dell'host da aggiungere:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Modifica del gruppo parallelo \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nome del gruppo:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocollo:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Limite supporti:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Aggiungi"
 
 #: ../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 "Rimuovi"
 
 #: ../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 "Configura urpmi in parallelo (esecuzione distribuita di urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Gruppo"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocollo"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Limite supporti"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocollo"
+
 #: ../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 "(nessuna)"
 
-#: ../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 "Modifica..."
 
-#: ../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 "Aggiungi..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Gestione delle chiavi per le firme digitali dei pacchetti"
 
-#: ../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 "Supporti"
 
 #: ../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 "nessun nome trovato, la chiave non esiste nel keyring rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Aggiungi chiave "
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Scegli una chiave da aggiungere al supporto %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Rimozione chiave"
 
 #: ../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 +417,32 @@ msgstr ""
 "(nome della chiave: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Aggiungi chiave..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Rimuovi chiave"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Configura i supporti"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Abilitata?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Aggiorna"
 
-#: ../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"
@@ -526,38 +452,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Aggiungi personalizzato..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Aggiorna..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Gestione chiavi..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "In parallelo..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Opzioni globali..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Guida"
 
-#: ../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 +487,7 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -583,8 +502,7 @@ msgstr ""
 "pacchetti software. Essi saranno quindi disponibili per l'installazione\n"
 "di nuovi pacchetti o per l'aggiornamento di quelli esistenti."
 
-#: ../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"
@@ -595,13 +513,23 @@ msgstr ""
 "che ne fanno uso (state usando un altro gestore di pacchetti su di \n"
 "un altro desktop o state già installando dei pacchetti?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Impossibile aggiungere il supporto, parametri errati o incompleti"
 
-#: ../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 ""
+"State per aggiungere un nuovo supporto per i pacchetti, `%s'.\n"
+"Questo significa che sarà possibile aggiungere nuovi pacchetti\n"
+"software al tuo sistema da quel supporto."
+
+#: ../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"
@@ -611,91 +539,85 @@ msgstr ""
 "Questo significa che sarà possibile aggiungere nuovi pacchetti\n"
 "software al tuo sistema da quel supporto."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Supporto `%s' aggiunto con successo."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Supporto `%s' aggiunto con successo."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Uso: %s [OPZIONE]..."
 
-#: ../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       - usa solo supporti di aggiornamento.\n"
 
-#: ../rpmdrake:42
-#, fuzzy, c-format
+#: ../rpmdrake:45
+#, fuzzy
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name           - stampa solo il nome dei pacchetti.\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"
 "               Rapporto del demone 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 "In esecuzione in modo utente"
 
-#: ../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 +627,517 @@ msgstr ""
 "Non potrai apportare modifiche al sistema, ma\n"
 "potrai comunque sfogliare il database esistente."
 
-#: ../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 "Archiviazione"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Masterizzazione"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compressione"
 
-#: ../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 "Altro"
 
-#: ../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 "Libri"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Libri d'informatica"
 
-#: ../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 "Letteratura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Trasferimento dei messaggi"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Servizi di accodamento"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Comunicazioni"
 
-#: ../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 "Sviluppo"
-
-#: ../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 "Sviluppo"
+
+#: ../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 "Editor"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Educazione"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Gestione file"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Giochi"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Avventure"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Giochi"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Schede"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Schede"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Rompicapo"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../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 "Desktop grafico"
-
-#: ../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 grafico"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Basato 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 "Grafica"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitoraggio"
 
-#: ../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 "Rete"
-
-#: ../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 "Rete"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Trasferimento file"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Messaggi istantanei"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Posta"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Accesso remoto"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ufficio"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Chiavi Pubbliche"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Editoria"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Scienze"
-
-#: ../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 "Scienze"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chimica"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informatica"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Scienze della terra"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematica"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fisica"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Suono"
 
-#: ../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 "Configurazione"
+#: ../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 "Boot e init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configurazione"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pacchetti"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Stampa in corso"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Installazione"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Installazione"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Font"
-
-#: ../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 "Font"
+
+#: ../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 "Localizzazione"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel e hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Librerie"
 
-#: ../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 "Terminali"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Strumenti per testi"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Giochi"
 
-#: ../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 disponibile)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Risultati della ricerca"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Risultati della ricerca (nessuno)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Attendere, ricerca in corso..."
 
-#: ../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 "Aggiungibili"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Aggiornabili"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Aggiungibili"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Non selezionato"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Selezionato"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Non selezionato"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importanza: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Motivo dell'aggiornamento: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Nessuna descrizione"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "File:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Registro delle modifiche:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Supporto: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versione attualmente installata: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versione: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Dimensioni: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s kB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Importanza: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Dimensioni: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Riassunto: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Motivo dell'aggiornamento: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Nessuna descrizione"
+#. 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 "Ulteriori informazioni sul pacchetto..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Seleziona"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "È necessario uno dei seguenti pacchetti:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Seleziona"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Attendere, è in corso la creazione dell'elenco dei pacchetti..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Nessun aggiornamento"
 
-#: ../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 +1147,24 @@ msgstr ""
 "non sono disponibili aggiornamenti per i pacchetti installati sul\n"
 "tuo computer, oppure li hai già installati tutti."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Tutti"
 
 #. -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 "Maggiori informazioni"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informazioni sui pacchetti"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Devono essere rimossi altri pacchetti"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1374,13 +1174,11 @@ msgstr ""
 "anche i seguenti pacchetti:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Alcuni pacchetti non possono essere rimossi"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1388,8 +1186,7 @@ msgstr ""
 "Spiacente, la rimozione di questi pacchetti danneggerebbe il tuo 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"
@@ -1399,13 +1196,11 @@ msgstr ""
 "deselezionati i seguenti pacchetti:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Sono necessari altri pacchetti"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1415,18 +1210,17 @@ msgstr ""
 "installati anche i seguenti pacchetti:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (appartiene alla lista di esclusioni)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Alcuni pacchetti non possono essere installati"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1436,123 +1230,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Alcuni pacchetti devono essere rimossi"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selezionati: %d MB / Spazio libero su disco: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Dimensione pacchetti selezionati: %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 descrizione di questo pacchetto non è disponibile\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Aggiornamenti per la sicurezza"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Aggiornamenti correttivi"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Installa"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Aggiornamenti normali"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Installa"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "% scelte"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Scelte 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 "Tutti i pacchetti, in ordine alfabetico"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Tutti i pacchetti, per gruppo"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Tutti i pacchetti, per disponibilità di aggiornamenti"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Tutti i pacchetti, per dimensione"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Tutti i pacchetti, per stato di selezione"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Tutti i pacchetti, per supporto"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Tutti i pacchetti, per disponibilità di aggiornamenti"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Solo foglie, per data di installazione"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Tutti i pacchetti, per gruppo"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Aggiornamenti normali"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Aggiornamenti correttivi"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Aggiornamenti normali"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Aggiornamenti per la sicurezza"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "nei nomi"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "nelle descrizioni"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "nei nomi dei file"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informazioni normali"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Tutte le informazioni"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Devi prima scegliere almeno un pacchetto."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Troppi pacchetti selezionati"
 
 #: ../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"
@@ -1569,7 +1348,7 @@ msgstr ""
 "Vuoi davvero installare tutti i pacchetti selezionati?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1584,89 +1363,101 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../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
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Aggiorna supporto"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Annulla la selezione"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Ricarica la lista dei _pacchetti"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Esci"
 
-#: ../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 "/_Opzioni"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Mo_stra i pacchetti selezionati automaticamente"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Guida"
 
-#: ../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 "Cerca:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Cerca"
 
-#: ../rpmdrake:1219
-#, fuzzy, c-format
+#: ../rpmdrake:1239
+#, fuzzy
 msgid "Clear"
 msgstr "Cluster"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installa"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Esci"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Errore fatale"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Si è verificato un errore fatale: %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"
@@ -1678,13 +1469,12 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Supporto per gli aggiornamenti già esistente"
 
-#: ../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"
@@ -1700,13 +1490,12 @@ msgstr ""
 "\n"
 "Poi riavvia %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Come scegliere manualmente 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"
@@ -1720,58 +1509,56 @@ msgstr ""
 "\n"
 "Quindi riavvia %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Attendere, è in corso la ricerca dei pacchetti disponibili..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Attendere, è in corso la lettura del database dei pacchetti..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Analisi di %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "modifiche:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Rimuovi .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Usa .%s come file principale"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Non fare niente"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Installazione completata"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Esamina..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Tutti i pacchetti richiesti sono stati installati correttamente."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Si sono verificati dei problemi durante l'installazione"
 
-#: ../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"
@@ -1781,18 +1568,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Impossibile prelevare i pacchetti sorgenti."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Impossibile prelevare i pacchetti sorgenti. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1804,38 +1590,34 @@ msgstr ""
 "Errori riportati:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Installazione dei pacchetti..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inizializzazione..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Installazione dei pacchetti..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Cambia supporto"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Inserisci il supporto \"%s\" nel dispositivo [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Scarico il pacchetto \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Verifico le firme dei pacchetti..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1849,13 +1631,12 @@ msgstr ""
 "\n"
 "Vuoi proseguire con l'installazione?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Installazione fallita"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1867,23 +1648,22 @@ msgstr ""
 "\n"
 "Prova ad aggiornare il database dei supporti."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Preparazione dei pacchetti per l'installazione..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installazione del pacchetto \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "non riesco ad accedere al file rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1895,43 +1675,33 @@ msgstr ""
 "Sono stati creati alcuni file di configurazione \".rpmnew\" o \".rpmsave\",\n"
 "puoi esaminarli in modo da decidere cosa fare:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Questi pacchetti sono muniti di informazioni per l'aggiornamento."
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Ulteriori informazioni sul pacchetto... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Non è stato trovato alcun pacchetto da installare."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Errore fatale: non è stato trovato alcun pacchetto da installare."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Attendere, è in corso la lettura del database dei pacchetti..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Attendere, è in corso la rimozione dei pacchetti..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Si sono verificati dei problemi durante la rimozione"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1941,8 +1711,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1954,8 +1723,8 @@ msgstr ""
 "Questo programma ti aiuterà nella selezione del\n"
 "software che deve essere rimosso dal tuo computer."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1967,13 +1736,11 @@ msgstr ""
 "Questo programma ti aiuterà a scegliere gli aggiornamenti da\n"
 "installare sul tuo computer."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Benvenuto nel programma di installazione software!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1987,214 +1754,174 @@ msgstr ""
 "software su CD-ROM o DVD. Questo programma ti aiuterà a scegliere il\n"
 "software da installare sul tuo computer."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Aggiornamenti 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
+msgid "Software Update"
+msgstr "Aggiornamenti Software"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Inserisci qui il tuo indirizzo email "
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Nome utente:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Rimozione Pacchetti Software"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Aggiornamento Pacchetti Software"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Installazione dei pacchetti"
 
-#: ../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 "Informazioni..."
 
-#: ../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 "Belgio"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasile"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Svizzera"
 
-#: ../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 "Repubblica Ceca"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Germania"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danimarca"
 
-#: ../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 "Spagna"
 
-#: ../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 "Ungheria"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israele"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Giappone"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Paesi Bassi"
 
-#: ../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 "Portogallo"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Russia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Svezia"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovacchia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Regno Unito"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Cina"
 
-#: ../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 "Stati Uniti"
 
-#: ../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 +1933,7 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../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"
@@ -2220,25 +1946,28 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "% scelte"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Attendere, è in corso il download degli indirizzi dei mirror."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Attendere, è in corso il download degli indirizzi dei mirror dal sito 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 "Errore durante il download"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2252,8 +1981,8 @@ msgstr ""
 "Probabilmente la rete o il sito web non sono disponibili.\n"
 "Riprova più tardi."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2267,18 +1996,15 @@ msgstr ""
 "Probabilmente la rete o il sito web di Mandriva non\n"
 "sono disponibili. Riprova più tardi."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nessun mirror"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Nessun mirror adeguato è disponibile."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2292,69 +2018,64 @@ msgstr ""
 "la possibilità che l'architettura del tuo processore non sia\n"
 "supportata dagli aggiornamenti ufficiali di Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Scegli il mirror che preferisci."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copio i file per il supporto \"%s\"..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Esamino i file del supporto \"%s\"..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Esamino il file remoto del supporto \"%s\"..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " fatto."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " fallita!"
 
 #. -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 dal supporto %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Inizio del download di \"%s\"..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download di %s, tempo rimasto: %s, velocità: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download di \"%s\", velocità: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Attendere, aggiornamento dei supporti in corso..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Errore nello scaricare i pacchetti"
 
-#: ../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,34 +2090,29 @@ msgstr ""
 "irraggiungibile e devi riprovare più tardi\n"
 " "
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Aggiorna supporti"
 
-#: ../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 "Seleziona i supporti che vuoi aggiornare:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Seleziona tutto"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2408,8 +2124,8 @@ msgstr ""
 "Errori:\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"
@@ -2419,18 +2135,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Impossibile creare il supporto."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Errore nell'aggiunta del supporto"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2440,8 +2154,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"
@@ -2451,8 +2165,8 @@ msgstr ""
 "di %s che stai usando(%s).\n"
 "Verrà disabilitato. "
 
-#: ../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"
@@ -2462,13 +2176,11 @@ msgstr ""
 "di Mandriva Linux che stai usando(%s).\n"
 "Verrà disabilitato. "
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Guida avviata 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 ""
@@ -2744,3 +2456,15 @@ msgstr "Rimuovi software"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Gestiore dei supporti software"
+
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Tutti i pacchetti, per supporto"
+
+#~ msgid "Normal information"
+#~ msgstr "Informazioni normali"
+
+#~ msgid "Maximum information"
+#~ msgstr "Tutte le informazioni"
diff --git a/po/ja.po b/po/ja.po
index c8578a5d..35fe5b24 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ja\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-09 23:00+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -20,13 +21,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"
@@ -47,18 +46,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"
@@ -76,104 +73,84 @@ 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
-#, 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?"
@@ -181,13 +158,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 "メディアの種類:"
 
@@ -195,10 +170,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 "キャンセル"
 
@@ -207,101 +181,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 "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 "インストールする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 "全体のプロクシ設定"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -310,166 +269,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を設定(distributed execution of 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にありません。"
 
 #: ../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)"
@@ -478,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
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -518,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"
@@ -559,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"
@@ -574,8 +491,7 @@ msgstr ""
 "設定したメディアから新しいRPMをインストールしたり\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"
@@ -587,13 +503,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"
@@ -603,18 +529,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"
@@ -622,43 +552,36 @@ 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            モードを指定: install(デフォルト), remove, update"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      updateモードで最初の確認メッセージを表示しない"
 
-#: ../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"
@@ -666,33 +589,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                 強制的に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"
@@ -702,634 +619,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 "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 "FAQ"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "HowTo"
 
-#: ../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 "アーケード"
 
-#: ../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 "起動と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 "Deploiement"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Deployment"
 
-#: ../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 "RPMを並べかえています。お待ちください.."
 
-#: ../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"
@@ -1338,29 +1138,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"
@@ -1370,13 +1165,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"
@@ -1384,8 +1177,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"
@@ -1395,13 +1187,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"
@@ -1411,18 +1201,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"
@@ -1432,123 +1221,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 "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 "全パッケージ(ABC順)"
 
-#: ../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"
@@ -1564,7 +1338,7 @@ msgstr ""
 "選択したパッケージを全てインストールしますか？"
 
 #: ../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"
 "続けますか？"
 
-#: ../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 "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"
@@ -1672,13 +1457,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"
@@ -1692,13 +1476,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"
@@ -1712,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 "RPMのメディアを読み込んでいます。お待ちください.."
+
+#: ../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"
@@ -1773,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"
@@ -1796,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"
@@ -1841,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"
@@ -1859,23 +1634,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"
@@ -1887,43 +1660,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 "RPMのメディアを読み込んでいます。お待ちください.."
-
-#: ../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"
@@ -1933,8 +1696,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1945,8 +1707,8 @@ msgstr ""
 "\n"
 "このツールはシステムからソフトウェアを削除するお手伝いをします。"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1957,13 +1719,11 @@ msgstr ""
 "\n"
 "このツールはパッケージを更新するお手伝いをします。"
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "RPMインストールツールへようこそ"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1976,214 +1736,172 @@ msgstr ""
 "Mandriva Linuxの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 "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 "RPMを削除"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "RPMのアップデート"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "RPMをインストール"
 
-#: ../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"
@@ -2195,8 +1913,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"
@@ -2208,23 +1925,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 "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"
@@ -2238,8 +1958,8 @@ msgstr ""
 "ネットワークかウェブサイトが利用不能になっているようです。\n"
 "しばらくたってからやり直してください。"
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2253,18 +1973,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"
@@ -2278,69 +1995,64 @@ msgstr ""
 "アーキテクチャがMandriva Linuxの公式アップデートでサポートされて\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"
@@ -2355,36 +2067,31 @@ 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"
@@ -2396,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"
@@ -2407,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"
@@ -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 ""
 "いません。\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"
@@ -2450,13 +2155,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 "ヘルプウィンドウを起動しました。まもなくデスクトップに表示されます。"
@@ -2731,6 +2434,18 @@ msgstr "RPMを削除"
 msgid "Software Media Manager"
 msgstr "RPMメディアマネージャ"
 
+#~ 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/ka.po b/po/ka.po
index 1efffe26..425451c1 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bootsplash 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: 2004-04-22 00:44+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@qartuli.net>\n"
 "Language-Team: Georgian <aiet@qartuli.com>\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,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 ""
 
-#: ../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
-#, c-format
+#: ../edit-urpm-sources.pl:134
 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"
+#: ../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 +147,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 +158,293 @@ 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
-#, 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"
 "%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 +453,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 +461,793 @@ 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 "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 ""
 
-#: ../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 "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 ""
 
-#: ../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 "გარსები (Shells)"
 
-#: ../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 ""
 
-#: ../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: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 ""
 
-#: ../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
-#, c-format
-msgid "No description"
+#. 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"
 "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
+msgid "All updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
-msgid "in names"
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1059
-#, c-format
-msgid "in descriptions"
+#: ../rpmdrake:1013
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:1061
-#, c-format
-msgid "in file names"
+#: ../rpmdrake:1013
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
+#: ../rpmdrake:1068
+msgid "in names"
 msgstr ""
 
 #: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
+msgid "in descriptions"
+msgstr ""
+
+#: ../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 +1258,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 +1267,99 @@ 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
-#, 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
+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 +1367,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 +1382,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 +1396,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 +1470,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 +1506,12 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../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"
@@ -1749,23 +1519,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 "პაკეტის ინსტალაცია: `%s' (%s/%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"
@@ -1773,51 +1541,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 +1582,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1834,13 +1591,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 +1604,173 @@ 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
-#, c-format
+#: ../rpmdrake.pm:129
 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"
@@ -2064,8 +1778,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 +1786,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 +1813,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 +1823,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 +1840,64 @@ 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
-#, 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:656
+#, fuzzy, 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 +1907,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 +1937,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,6 +2256,9 @@ msgstr ""
 msgid "Software Media Manager"
 msgstr ""
 
+#~ msgid "Stop"
+#~ msgstr "სტოპ"
+
 #~ msgid "Booting the system..."
 #~ msgstr "მოგესალმებით! ვიძახებ სისტემას..."
 
diff --git a/po/ko.po b/po/ko.po
index b560a61c..2fabc020 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -14,7 +14,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: 2002-08-25 14:32+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -22,13 +23,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,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 "일반 업데이트"
 
-#: ../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,88 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../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
-#, 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 "합성/목록 파일로의 상대 경로:"
 
-#: ../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?"
@@ -173,13 +155,13 @@ msgstr ""
 "이미 동일한 이름의 매체가 있습니다.\n"
 "새로 바꾸시겠습니까?"
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:239
+#, fuzzy
 msgid "Adding a medium:"
 msgstr "소스 추가:"
 
-#: ../edit-urpm-sources.pl:244
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:241
+#, fuzzy
 msgid "Type of medium:"
 msgstr "소스 유형:"
 
@@ -187,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 "취소"
 
@@ -199,101 +180,91 @@ 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 "[%s] 팩키지를 설치할 수 없습니다.\n"
 
 #: ../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
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "기다려 주세요. 매체 제거 중..."
 
 #: ../edit-urpm-sources.pl:394
-#, fuzzy, c-format
+#, fuzzy
 msgid "Edit a medium"
 msgstr "소스 편집"
 
 #: ../edit-urpm-sources.pl:400
-#, fuzzy, c-format
+#, fuzzy, 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
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
+#, fuzzy
 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]>):"
@@ -302,241 +273,208 @@ 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
-#, 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
-#, 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 "소스 [%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"
 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
-#, 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
-#, 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"
@@ -546,8 +484,8 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../edit-urpm-sources.pl:1010
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1024
+#, fuzzy
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -561,8 +499,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"
@@ -570,736 +507,623 @@ 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 "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
-#, fuzzy, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
+#, fuzzy
 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 ""
 
-#: ../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"
-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 "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 "대화"
 
-#: ../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
-#, 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
-#, fuzzy, 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
+#, fuzzy
+msgid "Not selected"
+msgstr "충돌이 감지되었습니다."
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "선택됨"
 
-#: ../rpmdrake:523
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "충돌이 감지되었습니다."
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "중요도: "
 
-#: ../rpmdrake:553
-#, fuzzy, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "업데이트 이유:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "설명 없음"
+
+#: ../rpmdrake:586
+#, fuzzy
 msgid "Files:\n"
 msgstr "%s파일들:\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
+#, 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
-#, 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"
@@ -1309,29 +1133,25 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
+#, fuzzy
 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"
@@ -1341,20 +1161,18 @@ msgstr ""
 "다음 팩키지들도 제거 되어야 합니다:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, fuzzy, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
+#, fuzzy
 msgid "Some packages can't be removed"
 msgstr "[%s] 팩키지를 설치할 수 없습니다.\n"
 
-#: ../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"
@@ -1364,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"
@@ -1380,18 +1196,18 @@ msgstr ""
 "설치되어야 합니다.\n"
 "\n"
 
-#: ../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 "[%s] 팩키지를 설치할 수 없습니다.\n"
 
-#: ../rpmdrake:823
-#, fuzzy, c-format
+#: ../rpmdrake:879
+#, fuzzy, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1400,123 +1216,114 @@ msgstr ""
 "다음 팩키지들은 선택될 수 없습니다:\n"
 "\n"
 
-#: ../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 ""
 
-#: ../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
-#, fuzzy, c-format
-msgid "All packages, by group"
-msgstr "모든 팩키지"
+#: ../rpmdrake:1007
+#, fuzzy
+msgid "All packages, by update availability"
+msgstr "업데이트 가능성별"
 
-#: ../rpmdrake:972
-#, fuzzy, c-format
+#: ../rpmdrake:1008
+#, fuzzy
 msgid "All packages, by size"
 msgstr "모든 팩키지"
 
-#: ../rpmdrake:973
-#, fuzzy, c-format
+#: ../rpmdrake:1009
+#, fuzzy
 msgid "All packages, by selection state"
 msgstr "선택 상태별"
 
-#: ../rpmdrake:977
-#, fuzzy, c-format
-msgid "All packages, by medium repository"
-msgstr "소스 등록별"
-
-#: ../rpmdrake:978
-#, fuzzy, 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
+#, fuzzy
+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
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "파일별"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "일반 정보"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "최대 정보"
-
 #: ../rpmdrake:1098
-#, fuzzy, c-format
+#, fuzzy
 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"
@@ -1534,7 +1341,7 @@ msgstr ""
 "정말로 선택된 모든 팩키지를 설치하시겠습니까?"
 
 #: ../rpmdrake:1117
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1548,89 +1355,102 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
+#, fuzzy
 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
+#, 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
-#, fuzzy, c-format
+#: ../rpmdrake:1306
+#, fuzzy
 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"
@@ -1642,13 +1462,13 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../rpmdrake:1295
-#, fuzzy, c-format
+#: ../rpmdrake:1323
+#, fuzzy
 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"
@@ -1658,13 +1478,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "수동으로 미러를 선택하는 방법"
 
-#: ../rpmdrake:1307
-#, fuzzy, c-format
+#: ../rpmdrake:1335
+#, fuzzy, 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"
@@ -1678,58 +1497,58 @@ msgstr ""
 "\n"
 "그런 후, 맨드리바 업데이트를 다시 실행하세요."
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:1551
+#, fuzzy
 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
-#, 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"
@@ -1739,18 +1558,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "소스 팩키지를 가져올 수 없습니다."
 
-#: ../rpmdrake:1557
-#, fuzzy, c-format
+#: ../rpmdrake:1654
+#, fuzzy, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "팩키지 설치는 root 사용자만 할 수 있습니다."
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1758,38 +1576,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../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 "장치 [%2$s]에 「%1$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
-#, fuzzy, c-format
+#: ../rpmdrake:1717
+#, fuzzy, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1803,13 +1617,12 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "설치 실패"
 
-#: ../rpmdrake:1630
-#, fuzzy, c-format
+#: ../rpmdrake:1727
+#, fuzzy, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1819,23 +1632,23 @@ msgstr ""
 "설치 실패. 일부 파일이 없습니다.\n"
 "소스 데이터베이스를 업데이트해 보세요."
 
-#: ../rpmdrake:1645
-#, fuzzy, c-format
+#: ../rpmdrake:1742
+#, fuzzy
 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"
@@ -1847,43 +1660,35 @@ msgstr ""
 "일부 설정 파일들은 '.rpmnew' 또는 '.rpmsave'로 생성되었습니다.\n"
 "조치를 취하기 위해 일부를 조사해 볼 수 있습니다:"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:1833
+#, fuzzy
 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
-#, fuzzy, c-format
+#: ../rpmdrake:1870
+#, fuzzy, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1893,8 +1698,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1906,8 +1710,8 @@ msgstr ""
 "이 도구는 컴퓨터에서 제거할 소프트웨어를 선택할 수 있도록\n"
 "도와 줍니다."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1919,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"
@@ -1940,214 +1742,178 @@ msgstr ""
 "록\n"
 "도와 줍니다."
 
-#: ../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
-#, 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
-#, 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
-#, 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
-#, 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"
@@ -2159,8 +1925,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"
@@ -2172,25 +1937,28 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../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
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "내려받기 중 오류"
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2204,8 +1972,8 @@ msgstr ""
 "네트웍 또는 맨드리바소프트 웹사이트가 현재 유효하지 않은 듯 합니다.\n"
 "나중에 다시 시도해 보세요."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2219,18 +1987,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"
@@ -2244,69 +2009,65 @@ 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 ""
 
-#: ../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 "파일별"
 
 #. -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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:656
+#, fuzzy, 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 ""
 
-#: ../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"
@@ -2316,34 +2077,31 @@ 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
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "모두 선택"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "업데이트 버전"
 
-#: ../rpmdrake.pm:768
-#, fuzzy, c-format
+#: ../rpmdrake.pm:784
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2351,26 +2109,25 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "기다려 주세요. 매체 추가 중..."
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2380,29 +2137,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 ""
@@ -2680,6 +2435,19 @@ msgstr "소프트웨어 제거"
 msgid "Software Media Manager"
 msgstr "소프트웨어 소스 관리자"
 
+#~ msgid "Stop"
+#~ msgstr "중지"
+
+#, fuzzy
+#~ msgid "All packages, by medium repository"
+#~ msgstr "소스 등록별"
+
+#~ msgid "Normal information"
+#~ msgstr "일반 정보"
+
+#~ msgid "Maximum information"
+#~ msgstr "최대 정보"
+
 #, fuzzy
 #~ msgid "everything was installed correctly"
 #~ msgstr "모든 설치를 마쳤습니다."
diff --git a/po/ku.po b/po/ku.po
index fb79abd7..c873c664 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ku\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-14 21:21+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com, pckurd@hotmail.com>\n"
 "Language-Team: Kurdish <gnu-ku-wergerandin@lists.sourceforge.net>\n"
@@ -16,13 +17,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 ""
 
-#: ../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,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"
@@ -58,116 +55,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 "Dosyayên herêmî"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Rê:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Pêşkêşkara 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 "Naûnîshan:"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "Pêşkêşkara FTP'ê"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Pêşkêşkara 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 "Ger..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Têketin:"
 
-#: ../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 "Şîfre:"
 
-#: ../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 "Nav:"
 
 #: ../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 ""
 
@@ -175,10 +151,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 "Betal"
 
@@ -187,350 +162,294 @@ msgstr "Betal"
 #: ../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 "Temam"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "Her dem"
 
 #: ../edit-urpm-sources.pl:311
-#, fuzzy, c-format
+#, fuzzy
 msgid "never"
 msgstr "Tu car"
 
 #: ../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 "Guherandinan tomar bike"
 
-#: ../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 "Bikarhêner:"
 
 #: ../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 "Nave kome:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../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 "Zêde bike"
 
 #: ../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 "Rake"
 
 #: ../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 "Komele"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Ferman"
 
-#: ../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 "(tune)"
 
-#: ../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 "Biguhere..."
 
-#: ../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 "Lêpirkirin..."
 
 #: ../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 "Medya"
 
 #: ../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
-#, 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"
 "%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 "Rojane dike..."
 
-#: ../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 "alîkarî"
 
-#: ../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"
@@ -539,8 +458,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"
@@ -548,939 +466,794 @@ 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 "Kullanımı: %s [SEÇENEKLER]..."
 
-#: ../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 "Gihîştin"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arşîv kirin"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Yêdek çêkirin"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Binîvise CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Dewisandin"
 
-#: ../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 "Wekî din"
 
-#: ../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 "Pirtûk"
 
-#: ../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 "Wêje"
 
-#: ../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 "Komunîkasyon"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Danêyan baz"
 
-#: ../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 "Perisandin"
-
-#: ../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 "Perisandin"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME  GTûK+"
 
-#: ../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 "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 "Edîtor"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Perwerdehî"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emûlatôr"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Amûranan Pel"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Lîstik"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Macera"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Lîstik"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Makîneyê Lîstik"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Lîstîkê texte"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kartên"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "çêkexerakên"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Werzîş"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Stratejî"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Sermaseyeya grafîk"
-
-#: ../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 "Sermaseyeya grafîk"
+
+#: ../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 "Grafîk"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "şopandin"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multîmedya"
 
-#: ../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 "Network"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Sohbet"
 
-#: ../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 "Network"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transfera pel"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Mesajen zêhn"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Name"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Nûçe"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Gihîna dur"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ofîs"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "çapkirin- Weşan"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Zanistiyên"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Esmannasî"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Zanistiyên"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biyolojî"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kîmya"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Zanista Komputer"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Zanistiyên Cîh"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematîk"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fizîk"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Qalikan"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Deng"
 
-#: ../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îstem"
-
-#: ../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 "Ve avakirin"
+#: ../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îstem"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Vekin û pêşînkirin"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Ve avakirin"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Komputer"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr ""
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Danenivîs"
 
-#: ../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 "Awayê nivîsan"
-
-#: ../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 "Awayê nivîsan"
+
+#: ../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 "Pêşkşêkar"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr ""
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Termînal"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Amûran Nivîs"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Lîstok"
 
-#: ../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 ""
 
-#: ../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 "Rawestîne"
+#: ../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"
+#: ../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 "Girîngî: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Sedema rojanekirinê: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "Nasnameya kurt : "
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Dosya:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Medya: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Guhertoya heyî"
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nav : "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Guherto: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Mezinahî :"
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Girîngî: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Mezinahî :"
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Destpêk : "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Sedema rojanekirinê: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Nasnameya kurt : "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "Nasnameya kurt : "
+#. 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"
+#: ../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 "Hemû"
 
 #. -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 "Damezrin"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr ""
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Damezrin"
 
-#: ../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
+msgid "All updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr ""
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr ""
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr ""
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "di navan de"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "di şîrovan de"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "di navên dosiyan de"
 
-#: ../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"
@@ -1491,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"
@@ -1500,89 +1273,99 @@ 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 "/_Dosya"
 
-#: ../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 "/_Derkeve"
 
-#: ../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 "/_Bijartin"
 
-#: ../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 "/_Alîkarî"
 
-#: ../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 "Bibîne:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Lê bigere"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Paqij Bike"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Damezrin"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Derkeve"
 
-#: ../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"
@@ -1590,13 +1373,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 +1388,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 +1402,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 "guherandin:"
 
-#: ../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"
@@ -1698,38 +1476,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"
@@ -1738,13 +1512,12 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Saz kirin bi ser neket."
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1752,23 +1525,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"
@@ -1776,51 +1547,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"
@@ -1828,8 +1588,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1837,13 +1597,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 +1610,173 @@ 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 "Ji bo %s@%s şîfreya miftehî binivîse:"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Nave bikarhêner:"
 
-#: ../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 "Na"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Erê"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Ewistirya"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Ewistiralya"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belçîqa"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brezîlya"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Qenada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Îswîçre"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Kosta Rîka"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Komara Çek"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Elmanya"
 
-#: ../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 "Yewnanîstan"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Îspanya"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Fînlandîya"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Frense"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Mecerîstan"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Îsraîl"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Îtalya"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japonya"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Hollanda"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norweç"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polonya"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portekîz"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Îsweç"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Sîngapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr ""
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taywan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Şahitiya Yekbuyî"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Çî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 "Dewletên Yekbuyî (yên Emerîqa)"
 
-#: ../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 +1784,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 +1792,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"
@@ -2101,8 +1819,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 +1829,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"
@@ -2131,69 +1846,64 @@ 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
-#, 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:656
+#, fuzzy, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Sîstem tê girtin..."
 
-#: ../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"
@@ -2203,34 +1913,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 "Hemûyî hilbijêre"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Rojanekirin"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2238,55 +1943,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 ""
@@ -2561,5 +2262,8 @@ msgstr ""
 msgid "Software Media Manager"
 msgstr ""
 
+#~ msgid "Stop"
+#~ msgstr "Rawestîne"
+
 #~ msgid "Edit"
 #~ msgstr "Biguhere"
diff --git a/po/ky.po b/po/ky.po
index dab12b45..7a13f91b 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -9,7 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ky\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-07-15 12:33+0000\n"
 "Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
 "Language-Team: Kyrgyz\n"
@@ -18,13 +19,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"
@@ -47,18 +46,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"
@@ -76,104 +73,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 "Жол же биригүү чекити:"
 
-#: ../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?"
@@ -181,13 +159,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 "Булак тиби:"
 
@@ -195,10 +171,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 "Калтыруу"
 
@@ -207,101 +182,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 "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 "Орнотуулучу 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 "Глобалдык прокси параметрлери"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -310,139 +270,113 @@ 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"
@@ -451,27 +385,24 @@ msgstr ""
 "Ачкычтар"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "аты табылбады, rpm keyring'де ачкыч жок!"
 
 #: ../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)"
@@ -480,37 +411,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"
@@ -520,38 +445,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"
@@ -561,8 +480,7 @@ msgstr ""
 "\n"
 "Улантууга даярсызбы?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -577,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"
@@ -591,13 +508,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"
@@ -607,18 +534,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"
@@ -626,44 +557,37 @@ msgstr ""
 "  --биринчи-каттоо өзгөрүүдө       алдын ала терезеден катталуунун "
 "өзгөртүүсүн көрсөткүлө"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=чөйрө1,..     предел данным СМИ"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     кошууну сунуш кылат баардык .rpmnew/.rpmsav "
 "табылган файлдарга"
 
-#: ../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"
@@ -671,33 +595,27 @@ msgstr ""
 "  -- parallel=alias, параллель ыкмасында жайгашкан ээси, \"жалган ат "
 "\"группа колдонот, \"ээси \" керектүү көз карандылыктарды көрсөтүүчү машина"
 
-#: ../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                 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"
@@ -707,635 +625,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 "Архивдөө"
 
 # used in the stats page table
-#: ../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 "HOWTO"
 
-#: ../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 "Аркада оюндары"
 
-#: ../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 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 "Changelog:\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"
@@ -1345,29 +1146,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"
@@ -1377,13 +1173,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"
@@ -1392,8 +1186,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"
@@ -1403,13 +1196,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"
@@ -1419,18 +1210,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"
@@ -1440,123 +1230,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 "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 "Орнотуу датасы боюнча сорттолгон, калган пакеттер гана"
 
-#: ../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"
@@ -1574,7 +1349,7 @@ msgstr ""
 "Сиз чын эле тандалган пакеттерди орнотууну каалайсызбы?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1589,89 +1364,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"
@@ -1683,13 +1469,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"
@@ -1705,13 +1490,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"
@@ -1725,58 +1509,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"
@@ -1786,18 +1568,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"
@@ -1809,38 +1590,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"
@@ -1854,13 +1631,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"
@@ -1872,23 +1648,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] rpm файлына жетүүгө болбоду"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1900,43 +1675,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"
@@ -1946,8 +1711,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1959,8 +1723,8 @@ msgstr ""
 "Бул курал компьютериңизден сиз тандаган программаны\n"
 "алып салууга жардам берет."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1972,13 +1736,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"
@@ -1992,216 +1754,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 жаңылоосу"
 
-#: ../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 "proxy ге кирүү үчүн өтүнүч\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 "Италия"
 
 # used in the stats page table
-#: ../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 "Португалия"
 
 # used in the stats page table
-#: ../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"
@@ -2213,8 +1933,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"
@@ -2227,23 +1946,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 "Күтө туруңуз, 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"
@@ -2257,8 +1979,8 @@ msgstr ""
 "Тармак же веб-сайтка кирүү мүмкүн эмес.\n"
 "Кийинчерээк кайрадан аракет кылып көрүңүз."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2272,18 +1994,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"
@@ -2297,70 +2016,65 @@ 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 " аткарылды."
 
 # used in the stats page table
-#: ../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"
@@ -2376,34 +2090,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"
@@ -2415,8 +2124,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"
@@ -2426,18 +2135,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"
@@ -2447,8 +2154,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"
@@ -2458,8 +2165,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"
@@ -2469,13 +2176,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 ""
@@ -2751,6 +2456,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/lt.po b/po/lt.po
index 5ceb9d95..1e56071f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -11,7 +11,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: 2003-02-20 13:01+0200\n"
 "Last-Translator: Darius Liepuonis <dariusle@takas.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -19,13 +20,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"
@@ -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 "Saugumo atnaujinimai"
 
-#: ../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"
@@ -61,118 +59,105 @@ 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 ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../edit-urpm-sources.pl:128
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:130
+#, fuzzy
 msgid "Add a medium"
 msgstr "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Vietinės bylos"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Kelias:"
 
-#: ../edit-urpm-sources.pl:131
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:133
+#, fuzzy
 msgid "FTP server"
 msgstr "NIS serveris"
 
-#: ../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 "NIS serveris"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:134
-#, fuzzy, c-format
-msgid "Removable device"
-msgstr "Išmesti laikmeną"
-
-#: ../edit-urpm-sources.pl:134
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:136
+#, fuzzy
 msgid "Path or mount point:"
 msgstr "prijungimo vieta:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+#, fuzzy
+msgid "Removable device"
+msgstr "Išmesti laikmeną"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Naršyti..."
 
-#: ../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 "Slaptažodis:"
 
-#: ../edit-urpm-sources.pl:185 ../edit-urpm-sources.pl:404
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:188 ../edit-urpm-sources.pl:404
+#, fuzzy
 msgid "Relative path to synthesis/hdlist:"
 msgstr "reliatyvus kelias iki 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 "Pavadinimas:"
 
 #: ../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 "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:244
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:241
+#, fuzzy
 msgid "Type of medium:"
 msgstr "Laikmenos tipas:"
 
@@ -180,10 +165,9 @@ msgstr "Laikmenos tipas:"
 #: ../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 "Nutraukti"
 
@@ -192,356 +176,313 @@ msgstr "Nutraukti"
 #: ../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 "Gerai"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Ruošiamasi paketo diegimui"
 
 #: ../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 "Paketas `%s' negali būti įdiegtas\n"
 
 #: ../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 "Šaltinis: "
 
 #: ../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 ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
 #: ../edit-urpm-sources.pl:394
-#, fuzzy, c-format
+#, fuzzy
 msgid "Edit a medium"
 msgstr "Redaguoti Laikmena"
 
 #: ../edit-urpm-sources.pl:400
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Redaguoti Laikmena"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Išsaugoti pakeitimus"
 
-#: ../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 "Klaida..."
 
 #: ../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 ""
 "Atnaujinti\n"
 "laikmeną"
 
 #: ../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 "Tarpinės stoties (proxy) vartotojo vardas:"
 
 #: ../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 "Vartotojas:"
 
 #: ../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 "Redaguoti Laikmena"
 
 #: ../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 "Redaguoti Laikmena"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Grupės pavadinimas:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokolas:"
 
 #: ../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 "Pridėti"
 
 #: ../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 "Pašalinti"
 
 #: ../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 "Grupe"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokolas"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokolas"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Komanda"
 
-#: ../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 "(jokio)"
 
-#: ../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 "Redaguoti..."
 
-#: ../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 "Įdėti..."
 
 #: ../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 "Vidutinis"
 
 #: ../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 "Redaguoti Laikmena"
 
 #: ../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 "Nutolęs spausdintuvas"
 
 #: ../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 "Nutolęs spausdintuvas"
 
 #: ../edit-urpm-sources.pl:868
-#, fuzzy, c-format
+#, fuzzy
 msgid "Configure media"
 msgstr ""
 "Atnaujinti\n"
 "laikmeną"
 
-#: ../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 "Atnaujinti"
 
-#: ../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 "Pagalba"
 
-#: ../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"
@@ -550,8 +491,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,766 +499,662 @@ 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 "Vartojimas: %s [PARINKTIS]..."
 
-#: ../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 "Prieinamumas"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archyvavimas"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Atsarginės kopijos"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD kepimas"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Suspaudimas"
 
-#: ../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 "Kitas"
 
-#: ../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 "Kitas"
 
-#: ../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 "Ryšiai"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Duombazės"
 
-#: ../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 "Programavimas"
-
-#: ../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 "Programavimas"
+
+#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:217
+#, fuzzy
 msgid "KDE and Qt"
 msgstr "Kūrimo atnaujinimai"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Branduolys"
 
-#: ../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 "Redaktoriai"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Mokslas"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emuliatoriai"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Bylų įrankiai"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Žaidimai"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Nuotykiai"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Žaidimai"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkada"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Lentos"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kortos"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Dėlionės"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sportas"
 
-#: ../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 ""
-
-#: ../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 ""
 
-#: ../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 "Grafika"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Stebėjimas"
 
-#: ../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 "Tinklai"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Pokalbiai"
 
-#: ../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 "Tinklai"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Bylų siuntimas"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Greitų pranešimų siuntimas"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Paštas"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Naujienos"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Nuotolinis priėjimas"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Biuro programos"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Spausdinimas"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Mokslai"
-
-#: ../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 "Mokslai"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chemija"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informatika"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Gamtos mokslai"
 
-#: ../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 "SHell'ai"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Garsas"
 
-#: ../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 "Pagrindas"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfigūracija"
+#: ../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 "Įkrova ir paleidimas"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigūracija"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Geležis"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Paketai"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Spausdinu"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Kūrimo atnaujinimai"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Kūrimo atnaujinimai"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Šriftai"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsolė"
 
-#: ../rpmdrake:267
-#, fuzzy, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Šriftai"
+
+#: ../rpmdrake:278
+#, fuzzy
 msgid "True type"
 msgstr "Tipas"
 
-#: ../rpmdrake:268
-#, fuzzy, c-format
+#: ../rpmdrake:279
+#, fuzzy
 msgid "Type1"
 msgstr "Tipas"
 
-#: ../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 "Serveriai"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr ""
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminalai"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Teksto įrankiai"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Žaislai"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Vaizdas"
 
-#: ../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 "Paieškos rezultatai"
 
-#: ../rpmdrake:439
-#, fuzzy, c-format
+#: ../rpmdrake:446
+#, fuzzy
 msgid "Search results (none)"
 msgstr "Paieškos rezultatai"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, fuzzy, c-format
+#: ../rpmdrake:457
+#, fuzzy
 msgid "Please wait, searching..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, fuzzy, c-format
-msgid "Rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stop"
+#: ../rpmdrake:529 ../rpmdrake:746
+#, fuzzy
+msgid "Addable"
+msgstr "Galimi"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, fuzzy, c-format
-msgid "Addable"
-msgstr "Galimi"
+#: ../rpmdrake:531
+#, fuzzy
+msgid "Not selected"
+msgstr "Rasti konfliktai"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Pažymėtas"
 
-#: ../rpmdrake:523
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Rasti konfliktai"
+#: ../rpmdrake:574 ../rpmdrake:607
+#, fuzzy
+msgid "Importance: "
+msgstr "Svarba: %s\n"
 
-#: ../rpmdrake:553
-#, fuzzy, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr ""
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Nėra aprašymo"
+
+#: ../rpmdrake:586
+#, fuzzy
 msgid "Files:\n"
 msgstr "/_Byla"
 
-#: ../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 "Pavadinimas: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versija: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Dydis: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, fuzzy, c-format
-msgid "Importance: "
-msgstr "Svarba: %s\n"
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Dydis: "
 
-#: ../rpmdrake:582
-#, fuzzy, c-format
+#. extra empty line
+#: ../rpmdrake:611
+#, fuzzy
 msgid "Summary: "
 msgstr "Turinys"
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr ""
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Aprašas: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Nėra aprašymo"
+#. 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 "Prašom patvirtinti"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Vienas iš šių paketų yra reikalingas."
 
-#: ../rpmdrake:639
-#, fuzzy, c-format
+#: ../rpmdrake:672
+#, fuzzy
+msgid "Please choose"
+msgstr "Prašom patvirtinti"
+
+#: ../rpmdrake:695
+#, fuzzy
 msgid "Please wait, listing packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:657
-#, fuzzy, c-format
+#: ../rpmdrake:713
+#, fuzzy
 msgid "No update"
 msgstr "Saugumo atnaujinimai"
 
-#: ../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 "Visos"
 
 #. -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 "Negaliu atidaryti paketo"
 
-#: ../rpmdrake:757
-#, fuzzy, c-format
+#: ../rpmdrake:813
+#, fuzzy
 msgid "Some additional packages need to be removed"
 msgstr ""
 "Šis papildomas paketas turi būti įdiegtas kad viskas dirbtų gerai gerai:"
 
-#: ../rpmdrake:758
-#, fuzzy, c-format
+#: ../rpmdrake:814
+#, fuzzy
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1327,174 +1163,161 @@ msgstr ""
 "Kad būtų patenkintos visos priklausomybės,\n"
 "šie paketai bus pašalinti:"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, fuzzy, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
+#, fuzzy
 msgid "Some packages can't be removed"
 msgstr "Paketas `%s' negali būti įdiegtas\n"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:878
+#, fuzzy
 msgid "Some packages can't be installed"
 msgstr "Paketas `%s' negali būti įdiegtas\n"
 
-#: ../rpmdrake:823
-#, fuzzy, c-format
+#: ../rpmdrake:879
+#, fuzzy, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s"
 msgstr "Paketas `%s' negali būti įdiegtas\n"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:863
-#, fuzzy, c-format
+#: ../rpmdrake:919
+#, fuzzy, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "%d pažymėti paketai: %.1f MB"
 
-#: ../rpmdrake:864
-#, fuzzy, c-format
+#: ../rpmdrake:920
+#, fuzzy, perl-format
 msgid "Selected size: %d MB"
 msgstr "%d pažymėti paketai: %.1f 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 "Saugumo atnaujinimai"
-
-#: ../rpmdrake:939
-#, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Saugumo atnaujinimai"
+#: ../rpmdrake:1003
+msgid "Installed"
+msgstr "Įdiegtas"
 
-#: ../rpmdrake:939
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Saugumo atnaujinimai"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Neįdiegti"
 
-#: ../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
-#, fuzzy, c-format
-msgid "All packages, by group"
-msgstr "0 paketų, 0 baitų"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr ""
 
-#: ../rpmdrake:972
-#, fuzzy, c-format
+#: ../rpmdrake:1008
+#, fuzzy
 msgid "All packages, by size"
 msgstr "0 paketų, 0 baitų"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:977
-#, fuzzy, c-format
-msgid "All packages, by medium repository"
+#: ../rpmdrake:1010
+msgid "Leaves only, sorted by install date"
+msgstr ""
+
+#: ../rpmdrake:1011
+#, fuzzy
+msgid "All packages, by group"
 msgstr "0 paketų, 0 baitų"
 
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr ""
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:982
-#, c-format
-msgid "Leaves only, sorted by install date"
-msgstr ""
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "Bugfixes updates"
+msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "Normal updates"
+msgstr "Saugumo atnaujinimai"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Saugumo atnaujinimai"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1059
-#, fuzzy, c-format
+#: ../rpmdrake:1070
+#, fuzzy
 msgid "in descriptions"
 msgstr "Aprašymai"
 
-#: ../rpmdrake:1061
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "%d bylos"
 
-#: ../rpmdrake:1070
-#, fuzzy, c-format
-msgid "Normal information"
-msgstr "Saugumo atnaujinimai"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr ""
-
 #: ../rpmdrake:1098
-#, fuzzy, c-format
+#, fuzzy
 msgid "You need to select some packages first."
 msgstr "Atsiprašome, bet jums reikia perkrauti sistema kad įdiegti."
 
 #: ../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 +1328,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1117
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1519,89 +1342,105 @@ msgstr ""
 "\n"
 "Ar vistiek norite tęsti (praleidžiant šį paketą)?"
 
-#: ../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 "/_Byla"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Atnaujinti laikmeną"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "/Rikiuoti parinkimą"
 
-#: ../rpmdrake:1177
-#, fuzzy, c-format
+#: ../rpmdrake:1173
+#, fuzzy
 msgid "/Reload the _packages list"
 msgstr "Paketas %s nėra pasirašytas"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/I_šeiti"
 
-#: ../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 "/_Pasirinktys"
 
-#: ../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 "/_Pagalba"
 
-#: ../rpmdrake:1208
-#, c-format
+#: ../rpmdrake:1188
+msgid "/_Report Bug"
+msgstr ""
+
+#: ../rpmdrake:1190
+#, fuzzy
+msgid "/_About..."
+msgstr "/Pagalba/_Apie..."
+
+#: ../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 "Skaidrių šou"
+
+#. -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 "Surasti:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Ieškoti"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Išvalyti"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Įdiegti"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../rpmdrake:1276
-#, fuzzy, c-format
+#: ../rpmdrake:1306
+#, fuzzy
 msgid "Fatal error"
 msgstr "Rašymo klaida"
 
-#: ../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"
@@ -1609,15 +1448,15 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1295
-#, fuzzy, c-format
+#: ../rpmdrake:1323
+#, fuzzy
 msgid "Already existing update media"
 msgstr ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../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"
@@ -1627,13 +1466,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"
@@ -1642,58 +1480,62 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1343
-#, fuzzy, c-format
+#: ../rpmdrake:1372
+#, fuzzy
 msgid "Please wait, finding available packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+#, fuzzy
+msgid "Please wait, reading packages database..."
+msgstr "Prašom palaukti.Pašalinami paketai"
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1457
-#, fuzzy, c-format
+#: ../rpmdrake:1551
+#, fuzzy
 msgid "changes:"
 msgstr "Paketai"
 
-#: ../rpmdrake:1465
-#, fuzzy, c-format
+#: ../rpmdrake:1559
+#, fuzzy, perl-format
 msgid "Remove .%s"
 msgstr "Išimama"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1473
-#, fuzzy, c-format
+#: ../rpmdrake:1567
+#, fuzzy
 msgid "Do nothing"
 msgstr "Kompiuteris: "
 
-#: ../rpmdrake:1489
-#, fuzzy, c-format
+#: ../rpmdrake:1583
+#, fuzzy
 msgid "Installation finished"
 msgstr "Įdiegiama "
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
+#, fuzzy
 msgid "Problem during installation"
 msgstr "Įdiegimo metu įvyko klaida"
 
-#: ../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"
@@ -1703,18 +1545,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake:1557
-#, fuzzy, c-format
+#: ../rpmdrake:1654
+#, fuzzy, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Atsiprašome, bet jums reikia perkrauti sistema kad įdiegti."
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1722,38 +1563,35 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1567
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Ruošiamasi paketo diegimui"
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Ruošiama įdiegimui..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+#, fuzzy
+msgid "Package installation..."
+msgstr "Ruošiamasi paketo diegimui"
+
+#: ../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 "Prašome įkišti laikmeną pavadintą \"%s\", į įrenginį [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Siunčiami paketai `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1620
-#, fuzzy, c-format
+#: ../rpmdrake:1717
+#, fuzzy, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1767,13 +1605,12 @@ msgstr ""
 "\n"
 "Ar vistiek norite tęsti (praleidžiant šį paketą)?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Įdiegimas nepavyko"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1781,23 +1618,22 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1645
-#, fuzzy, c-format
+#: ../rpmdrake:1742
+#, fuzzy
 msgid "Preparing packages installation..."
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "negaliu prieiti prie rpm bylos [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1805,43 +1641,37 @@ 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 "Negaliu atidaryti paketo"
 
-#: ../rpmdrake:1735
-#, fuzzy, c-format
+#: ../rpmdrake:1832
+#, fuzzy
 msgid "No package found for installation."
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake:1736
-#, fuzzy, c-format
+#: ../rpmdrake:1833
+#, fuzzy
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake:1757
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prašom palaukti.Pašalinami paketai"
-
-#: ../rpmdrake:1809
-#, fuzzy, c-format
+#: ../rpmdrake:1858
+#, fuzzy
 msgid "Please wait, removing packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:1820
-#, fuzzy, c-format
+#: ../rpmdrake:1869
+#, fuzzy
 msgid "Problem during removal"
 msgstr "Įdiegimo metu įvyko klaida"
 
-#: ../rpmdrake:1821
-#, fuzzy, c-format
+#: ../rpmdrake:1870
+#, fuzzy, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1851,8 +1681,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1860,8 +1689,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1869,13 +1698,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"
@@ -1884,214 +1711,178 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Ruošiamasi paketo diegimui"
-
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
 msgid "Mandriva Linux Update"
 msgstr "Skaidrių šou"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Ruošiamasi paketo diegimui"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Vartotojo vardas:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr ""
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake.pm:172
-#, fuzzy, c-format
+#: ../rpmdrake.pm:174
+#, fuzzy
 msgid "Software Packages Installation"
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Taip"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr ""
 
-#: ../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 "Brazilija"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Šveicarija"
 
-#: ../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 "Čekija"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Vokiečių"
 
-#: ../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 "Graikija"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Ispanija"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Suomija"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Prancūzija"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Vengrija"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Izraelis"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italija"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japonija"
 
-#: ../rpmdrake.pm:395
-#, fuzzy, c-format
+#: ../rpmdrake.pm:400
+#, fuzzy
 msgid "Korea"
 msgstr "Dar"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Olandija"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvegija"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Lenkija"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugalija"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Švedija"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapūras"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakija"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taivanas"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Jungtinė karalystė"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Kinija"
 
-#: ../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 "Jungtinės amerikos valstijos"
 
-#: ../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"
@@ -2099,8 +1890,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"
@@ -2108,25 +1898,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 ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../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 "Klaida siunčiant"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2135,8 +1928,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"
@@ -2145,18 +1938,16 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:538
-#, fuzzy, c-format
+#: ../rpmdrake.pm:554
+#, fuzzy
 msgid "No mirror"
 msgstr "Lemtinga klaida"
 
-#: ../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"
@@ -2165,73 +1956,71 @@ msgid ""
 "by Mandriva Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:560
-#, fuzzy, c-format
+#: ../rpmdrake.pm:576
+#, fuzzy
 msgid "Please choose the desired mirror."
 msgstr ""
 "Prašom palaukti\n"
 "Gabenamas veidrodžių sąrašas"
 
-#: ../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 "%d bylos"
 
 #. -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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:656
+#, fuzzy, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Tikrinu '%s' parašą..."
 
-#: ../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 ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../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"
@@ -2241,34 +2030,30 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, fuzzy, c-format
+#: ../rpmdrake.pm:733
+#, fuzzy
 msgid "Update media"
 msgstr "Atnaujinti laikmeną"
 
-#: ../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 "Pažymėti viską"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2276,28 +2061,28 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:830
+#, fuzzy
 msgid "Unable to create medium."
 msgstr "Nepavyko sukurti raporto bylos, nutraukiu.\n"
 
-#: ../rpmdrake.pm:819
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2307,29 +2092,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 ""
@@ -2607,6 +2390,20 @@ msgstr ""
 msgid "Software Media Manager"
 msgstr "Programinės įrangos įdiegimas"
 
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#, fuzzy
+#~ msgid "All packages, by medium repository"
+#~ msgstr "0 paketų, 0 baitų"
+
+#, fuzzy
+#~ msgid "Normal information"
+#~ msgstr "Saugumo atnaujinimai"
+
+#~ msgid "Install"
+#~ msgstr "Įdiegti"
+
 #, fuzzy
 #~ msgid "Update medium"
 #~ msgstr "Atnaujinti laikmeną"
@@ -2649,9 +2446,6 @@ msgstr "Programinės įrangos įdiegimas"
 #~ "Blogas %s paketo GPG parašas arba\n"
 #~ "blogai įdiegtas GnuPG paketas"
 
-#~ msgid "Don't install"
-#~ msgstr "Neįdiegti"
-
 #~ msgid "Signature problem"
 #~ msgstr "Parašo problema"
 
@@ -2803,12 +2597,6 @@ msgstr "Programinės įrangos įdiegimas"
 #~ msgid "/File/_Quit"
 #~ msgstr "/Byla/_Išeiti"
 
-#~ msgid "/Help/_About..."
-#~ msgstr "/Pagalba/_Apie..."
-
-#~ msgid "Installed"
-#~ msgstr "Įdiegtas"
-
 #~ msgid "Mandrakeupdate, version 7.2\n"
 #~ msgstr "Mandrakeupdate, versija 7.2\n"
 
diff --git a/po/ltg.po b/po/ltg.po
index 5e27604a..c6e683f0 100644
--- a/po/ltg.po
+++ b/po/ltg.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-02-14 14:21+0200\n"
 "Last-Translator: Unknown :-(\n"
 "Language-Team: Latgalian <ll10nt@listes.murds.lv>\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,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 "Normals režims"
 
-#: ../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,104 +53,94 @@ 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 "lyudzu pagaidit cikom izpyldās ttmkfdir..."
 
-#: ../edit-urpm-sources.pl:128
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:130
+#, fuzzy
 msgid "Add a medium"
 msgstr "Dalikt moduli"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokalī faili"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Ceļš:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP servers"
 
-#: ../edit-urpm-sources.pl:131 ../edit-urpm-sources.pl:132
-#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:403
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:133 ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:135 ../edit-urpm-sources.pl:403
+#, fuzzy
 msgid "URL:"
 msgstr "+[Vītruods]"
 
-#: ../edit-urpm-sources.pl:132
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:134
+#, fuzzy
 msgid "RSYNC server"
 msgstr "FTP servers"
 
-#: ../edit-urpm-sources.pl:133
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:135
+#, fuzzy
 msgid "HTTP server"
 msgstr "FTP servers"
 
-#: ../edit-urpm-sources.pl:134
-#, fuzzy, c-format
-msgid "Removable device"
-msgstr "/Izjimt beigtūs failus"
-
-#: ../edit-urpm-sources.pl:134
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:136
+#, fuzzy
 msgid "Path or mount point:"
 msgstr "Samba monteišonys punkti"
 
-#: ../edit-urpm-sources.pl:150
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:136
+#, fuzzy
+msgid "Removable device"
+msgstr "/Izjimt beigtūs failus"
+
+#: ../edit-urpm-sources.pl:155
+#, fuzzy
 msgid "Browse..."
 msgstr "_Puorlyukuot..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Lītuotuojs:"
 
-#: ../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 "Parole:"
 
-#: ../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 "Vuords:"
 
 #: ../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 "Izavielejit cytu datu nesieju, nu kura atjaunuot"
 
-#: ../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
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:228
+#, fuzzy
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -160,13 +148,13 @@ msgstr ""
 "Printers \"%s\" jau eksistej,\n"
 "voi teišom gribit puorraksteit tuo konfiguraceju?"
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:239
+#, fuzzy
 msgid "Adding a medium:"
 msgstr "Dalikt moduli"
 
-#: ../edit-urpm-sources.pl:244
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:241
+#, fuzzy
 msgid "Type of medium:"
 msgstr "Instalacejis tips"
 
@@ -174,10 +162,9 @@ msgstr "Instalacejis tips"
 #: ../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 "Atceļt"
 
@@ -186,350 +173,322 @@ msgstr "Atceļt"
 #: ../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 "Labi"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Sagatavoju instaleišonu"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, fuzzy, c-format
+#, fuzzy
 msgid "never"
 msgstr "Servers"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Instalejamū pakūtņu izviele"
 
 #: ../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 "Programmaturys puorvaldeišona"
 
 #: ../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 "lyudzu pagaidit cikom izpyldās ttmkfdir..."
 
 #: ../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 "Dzīsmis maiņa"
 
-#: ../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 "Proxy (storpnīks)"
 
 #: ../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 "Konfigurēt proxy (storpnīku)"
 
 #: ../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 "DHCP resursa vuords"
 
 #: ../edit-urpm-sources.pl:474
-#, fuzzy, c-format
+#, fuzzy
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Jiusim juonūruoda saknis (root) sadaļa"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Lītuotuojs:"
 
 #: ../edit-urpm-sources.pl:545
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a parallel group"
 msgstr "Pīvīnuot nūteikumu"
 
 #: ../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 "Dalikt moduli"
 
 #: ../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 "Pīvūnuot hostdatoru"
 
 #: ../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 " uz paralelā porta \\/*%s"
 
 #: ../edit-urpm-sources.pl:646
-#, fuzzy, c-format
+#, fuzzy
 msgid "Group name:"
 msgstr "Grupys nūsaukums"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokols:"
 
 #: ../edit-urpm-sources.pl:649
-#, fuzzy, c-format
+#, fuzzy
 msgid "Media limit:"
 msgstr "Medeju klase"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Pīvīnuot"
 
 #: ../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 "Nūjimt"
 
 #: ../edit-urpm-sources.pl:656
-#, fuzzy, c-format
+#, fuzzy
 msgid "Hosts:"
 msgstr "Servers:"
 
 #: ../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 "Grupa"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokols"
-
-#: ../edit-urpm-sources.pl:693
-#, fuzzy, c-format
+#, fuzzy
 msgid "Media limit"
 msgstr "Medeju klase"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokols"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Komanda"
 
-#: ../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 "(nikas)"
 
-#: ../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ēt"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:970
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:984
+#, fuzzy
 msgid "Add..."
 msgstr "/Pīvīnuot"
 
 #: ../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
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:752 ../edit-urpm-sources.pl:909
+#, fuzzy
 msgid "Medium"
 msgstr "Beļgeja"
 
 #: ../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 "Dalikt lītuotuoju"
 
 #: ../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 "Nūjimt moduli"
 
 #: ../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 "Dalikt lītuotuoju"
 
 #: ../edit-urpm-sources.pl:852
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remove key"
 msgstr "Nūjimt"
 
 #: ../edit-urpm-sources.pl:868
-#, fuzzy, c-format
+#, fuzzy
 msgid "Configure media"
 msgstr "Konfigurēt laiku"
 
-#: ../edit-urpm-sources.pl:893
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:907
+#, fuzzy
 msgid "Enabled?"
 msgstr "īslēgt"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Modernizeijumi"
 
-#: ../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 "Nevar atdalīt: %s"
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "/Pīvīnuot"
 
-#: ../edit-urpm-sources.pl:978
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:992
+#, fuzzy
 msgid "Update..."
 msgstr "Modernizeijumi"
 
-#: ../edit-urpm-sources.pl:981
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:995
+#, fuzzy
 msgid "Manage keys..."
 msgstr "Puorvoldit projektus"
 
-#: ../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 "Paleidzeiba"
 
-#: ../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"
@@ -538,8 +497,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"
@@ -547,941 +505,860 @@ 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 "Lītuojums: %s [OPCIJAS]..."
 
-#: ../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 ""
 "\n"
 "                      DrakBackup demona ziņuojums\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 "Pīejameiba"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arhiveišona"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Rezervis kopeišona"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Kompaktdisku īraksteišona"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Kompreseja"
 
-#: ../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 "Cyts"
 
-#: ../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 "Suoknēt"
 
-#: ../rpmdrake:193
-#, fuzzy, c-format
+#: ../rpmdrake:203
+#, fuzzy
 msgid "Computer books"
 msgstr "Datorzynuotne"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:195
-#, fuzzy, c-format
+#: ../rpmdrake:205
+#, fuzzy
 msgid "Howtos"
 msgstr "Hostdators %s"
 
-#: ../rpmdrake:196
-#, fuzzy, c-format
+#: ../rpmdrake:206
+#, fuzzy
 msgid "Literature"
 msgstr "Alternativi"
 
-#: ../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 "Komunikacejis"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Datubāzis"
 
-#: ../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 "Izstruode"
-
-#: ../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 "Izstruode"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:206
-#, fuzzy, c-format
+#: ../rpmdrake:216
+#, fuzzy
 msgid "Java"
 msgstr "Japuona"
 
-#: ../rpmdrake:207
-#, fuzzy, c-format
+#: ../rpmdrake:217
+#, fuzzy
 msgid "KDE and Qt"
 msgstr "Datums i laiks"
 
-#: ../rpmdrake:208
-#, fuzzy, c-format
+#: ../rpmdrake:218
+#, fuzzy
 msgid "Kernel"
 msgstr "Kūduls:"
 
-#: ../rpmdrake:210
-#, fuzzy, c-format
+#: ../rpmdrake:220
+#, fuzzy
 msgid "Perl"
 msgstr "Peru"
 
-#: ../rpmdrake:211
-#, fuzzy, c-format
+#: ../rpmdrake:221
+msgid "PHP"
+msgstr ""
+
+#: ../rpmdrake:222
+#, fuzzy
 msgid "Python"
 msgstr "Ceļš"
 
-#: ../rpmdrake:212
-#, c-format
+#: ../rpmdrake:223
 msgid "Editors"
 msgstr "Redaktori"
 
-#: ../rpmdrake:213
-#, fuzzy, c-format
+#: ../rpmdrake:224
+#, fuzzy
 msgid "Education"
 msgstr "Komunikacejis"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Failu reiki"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, fuzzy, c-format
-msgid "Games"
-msgstr "Spieļu"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Pīdzeivuojumi"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#, fuzzy
+msgid "Games"
+msgstr "Spieļu"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Golda"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kartys"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Gryuši atrysynomys"
 
-#: ../rpmdrake:222
-#, fuzzy, c-format
+#: ../rpmdrake:233
+#, fuzzy
 msgid "Sports"
 msgstr "USB printers"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategeja"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, fuzzy, c-format
-msgid "Graphical desktop"
-msgstr "Cytys grafiskuos dorbaviersmys"
-
-#: ../rpmdrake:224
-#, fuzzy, c-format
+#: ../rpmdrake:235
+#, fuzzy
 msgid "Enlightenment"
 msgstr "Vide"
 
-#: ../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 "Cytys grafiskuos dorbaviersmys"
+
+#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:241
+#, fuzzy
 msgid "Sawfish"
 msgstr "Spānejis"
 
-#: ../rpmdrake:231
-#, fuzzy, c-format
+#: ../rpmdrake:242
+#, fuzzy
 msgid "WindowMaker"
 msgstr "Windows"
 
-#: ../rpmdrake:232
-#, c-format
+#: ../rpmdrake:243
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Nūvāruošona"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedeja"
 
-#: ../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 "Teikluošona"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Pļuopuošona"
 
-#: ../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 "Teikluošona"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Failu puorsyuteišona"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Interneta peidžers"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Posts"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Jaunumi"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Attuola pīkliušona"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "Puorstaipteiklys"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ofiss"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publiceišona"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Zynuotnis"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomeja"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Zynuotnis"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologeja"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kimeja"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Datorzynuotne"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geozynuotnis"
 
-#: ../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 "Čaulys"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Skaņa"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:268
+#, fuzzy
 msgid "Base"
 msgstr "Bass"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfiguraceja"
+#: ../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 "Īluode i inicializaceja"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfiguraceja"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Dzelži"
 
-#: ../rpmdrake:262
-#, fuzzy, c-format
+#: ../rpmdrake:273
+#, fuzzy
 msgid "Packaging"
 msgstr "Pakūtne:"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Drukuošona"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Izstruode"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Izstruode"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fonti"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsole"
 
-#: ../rpmdrake:267
-#, fuzzy, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Fonti"
+
+#: ../rpmdrake:278
+#, fuzzy
 msgid "True type"
 msgstr "Uztvierieja tips:"
 
-#: ../rpmdrake:268
-#, fuzzy, c-format
+#: ../rpmdrake:279
+#, fuzzy
 msgid "Type1"
 msgstr "Tips"
 
-#: ../rpmdrake:269
-#, fuzzy, c-format
+#: ../rpmdrake:280
+#, fuzzy
 msgid "X11 bitmap"
 msgstr "16 biti"
 
-#: ../rpmdrake:270
-#, fuzzy, c-format
+#: ../rpmdrake:281
+#, fuzzy
 msgid "Internationalization"
 msgstr "Interneta dators"
 
-#: ../rpmdrake:271
-#, fuzzy, c-format
+#: ../rpmdrake:282
+#, fuzzy
 msgid "Kernel and hardware"
 msgstr "Nūteiktuo aparatura"
 
-#: ../rpmdrake:272
-#, fuzzy, c-format
+#: ../rpmdrake:283
+#, fuzzy
 msgid "Libraries"
 msgstr "Libereja"
 
-#: ../rpmdrake:273
-#, fuzzy, c-format
+#: ../rpmdrake:284
+#, fuzzy
 msgid "Servers"
 msgstr "Servers"
 
-#: ../rpmdrake:274
-#, fuzzy, c-format
+#: ../rpmdrake:285
+#, fuzzy
 msgid "XFree86"
 msgstr "XFree %s"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Teksta reiki"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Rūtaļlītys"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, fuzzy, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
+#, fuzzy
 msgid "(Not available)"
 msgstr "Nav pīejamu sadaļu"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, fuzzy, c-format
+#: ../rpmdrake:446
+#, fuzzy
 msgid "Search results"
 msgstr "Meklēt serverus"
 
-#: ../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 "Lyudzu, uzgaidit..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, fuzzy, c-format
-msgid "Rpmdrake"
-msgstr "Rfbdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Apturēt"
+#: ../rpmdrake:529 ../rpmdrake:746
+#, fuzzy
+msgid "Addable"
+msgstr "atslēgt"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, fuzzy, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
+#, fuzzy
 msgid "Upgradable"
 msgstr "Atjaunynuot"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, fuzzy, c-format
-msgid "Addable"
-msgstr "atslēgt"
+#: ../rpmdrake:531
+#, fuzzy
+msgid "Not selected"
+msgstr "Nav izvalāts NIC!"
 
-#: ../rpmdrake:523
-#, fuzzy, c-format
+#: ../rpmdrake:531
+#, fuzzy
 msgid "Selected"
 msgstr "Izavielēt vysys"
 
-#: ../rpmdrake:523
-#, fuzzy, c-format
-msgid "Not selected"
-msgstr "Nav izvalāts NIC!"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Svareigums: "
+
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr ""
 
-#: ../rpmdrake:553
-#, fuzzy, c-format
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "Aproksts"
+
+#: ../rpmdrake:586
+#, fuzzy
 msgid "Files:\n"
 msgstr "Faili"
 
-#: ../rpmdrake:558
-#, fuzzy, c-format
+#: ../rpmdrake:591
+#, fuzzy
 msgid "Changelog:\n"
 msgstr "Kanali:"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:565
-#, fuzzy, c-format
+#: ../rpmdrake:597
+#, fuzzy
 msgid "Currently installed version: "
 msgstr "Pošreizejuos saskarnis konfiguraceju"
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Vuords: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Verseja: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Izmārs: "
-
-#: ../rpmdrake:576
-#, fuzzy, c-format
+#: ../rpmdrake:604
+#, fuzzy, perl-format
 msgid "%s KB"
 msgstr "Apjoms: %d KB\n"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Svareigums: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Izmārs: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Kūpsavylkums: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr ""
-
-#: ../rpmdrake:587
-#, fuzzy, c-format
+#: ../rpmdrake:617
+#, fuzzy
 msgid "Description: "
 msgstr "Aproksts:"
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "Aproksts"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+#, fuzzy
+msgid "Rpmdrake"
+msgstr "Rfbdrake"
 
-#: ../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 "Stereo (ja pīejams)"
 
-#: ../rpmdrake:618
-#, fuzzy, c-format
-msgid "Please choose"
-msgstr "Lyudzu izavielejit jiusu vaļsti."
-
-#: ../rpmdrake:618
-#, fuzzy, c-format
+#: ../rpmdrake:672
+#, fuzzy
 msgid "One of the following packages is needed:"
 msgstr "Tiks instaleitys sekūjūšys pakūtnis:\n"
 
-#: ../rpmdrake:639
-#, fuzzy, c-format
+#: ../rpmdrake:672
+#, fuzzy
+msgid "Please choose"
+msgstr "Lyudzu izavielejit jiusu vaļsti."
+
+#: ../rpmdrake:695
+#, fuzzy
 msgid "Please wait, listing packages..."
 msgstr "Lyudzu uzgaidit, uzstuodu drūšeibys leimini"
 
-#: ../rpmdrake:657
-#, fuzzy, c-format
+#: ../rpmdrake:713
+#, fuzzy
 msgid "No update"
 msgstr "Nav printera"
 
-#: ../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 "Vyss"
 
 #. -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 "Vairuok opceju"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, fuzzy, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
+#, fuzzy
 msgid "Information on packages"
 msgstr "Informaceja atjaunynuota."
 
-#: ../rpmdrake:757
-#, fuzzy, c-format
+#: ../rpmdrake:813
+#, fuzzy
 msgid "Some additional packages need to be removed"
 msgstr "Tiks nūjimtys sekuojūšys pakūtnis"
 
-#: ../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 "Tiks nūjimtys sekūjūšys %s pakūtnis"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:859
+#, fuzzy
 msgid "Additional packages needed"
 msgstr "Papyldus temys"
 
-#: ../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 "Tiks instaleitys sekūjūšys pakūtnis:\n"
 
-#: ../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 "Instalejamū pakūtņu izviele"
 
-#: ../rpmdrake:823
-#, fuzzy, c-format
+#: ../rpmdrake:879
+#, fuzzy, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s"
 msgstr "Tiks instaleitys sekūjūšys pakūtnis:\n"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, fuzzy, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
+#, fuzzy
 msgid "Some packages need to be removed"
 msgstr "Tiks nūjimtys sekūjūšys %s pakūtnis"
 
-#: ../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 "Faila izmārs: %d B"
 
-#: ../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 "Drūšeibys trauksmis:"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr ""
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Uzstuodeit"
 
-#: ../rpmdrake:939
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Normals režims"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Uzstuodeit"
 
-#: ../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 "Manuali"
 
-#: ../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 "Saglobuot pakūtņu izvieli"
 
-#: ../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 "Normals režims"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy, c-format
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "Normal updates"
+msgstr "Normals režims"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "Security updates"
+msgstr "Drūšeibys trauksmis:"
+
+#: ../rpmdrake:1068
+#, fuzzy
 msgid "in names"
 msgstr "Slāgvuords"
 
-#: ../rpmdrake:1059
-#, fuzzy, c-format
+#: ../rpmdrake:1070
+#, fuzzy
 msgid "in descriptions"
 msgstr "Aproksts"
 
-#: ../rpmdrake:1061
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "Nūruodit faila nūsaukumu"
 
-#: ../rpmdrake:1070
-#, fuzzy, c-format
-msgid "Normal information"
-msgstr "Detalizeita informaceja"
-
-#: ../rpmdrake:1070
-#, fuzzy, c-format
-msgid "Maximum information"
-msgstr "Detalizeita informaceja"
-
 #: ../rpmdrake:1098
-#, fuzzy, c-format
+#, fuzzy
 msgid "You need to select some packages first."
 msgstr "Jius varit izavielēt/atsateikt nu ituos pakūtnis"
 
 #: ../rpmdrake:1103
-#, fuzzy, c-format
+#, fuzzy
 msgid "Too many packages are selected"
 msgstr "Itei ir obligata pakūtne, nu tuos navar atsateikt"
 
 #: ../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"
@@ -1492,7 +1369,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1501,91 +1378,109 @@ 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 "/_Fails"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Modernizeijumi"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Ceļa izviele"
 
-#: ../rpmdrake:1177
-#, fuzzy, c-format
+#: ../rpmdrake:1173
+#, fuzzy
 msgid "/Reload the _packages list"
 msgstr "Instalejamū pakūtņu izviele"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Izīt"
 
-#: ../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 "/_Opcejis"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, fuzzy, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
+#, fuzzy
 msgid "/_Show automatically selected packages"
 msgstr "Paruodeit automatiski izvālātuos pakūtnis"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Paleidzeiba"
 
-#: ../rpmdrake:1208
-#, fuzzy, 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 "Manuali"
+
+#. -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
+#, fuzzy
 msgid "Find:"
 msgstr "Sūmeja"
 
-#: ../rpmdrake:1217
-#, fuzzy, c-format
+#: ../rpmdrake:1237
+#, fuzzy
 msgid "Search"
 msgstr "Meklēt:"
 
-#: ../rpmdrake:1219
-#, fuzzy, c-format
+#: ../rpmdrake:1239
+#, fuzzy
 msgid "Clear"
 msgstr "Kalendars"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Uzstuodeit"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Izīt"
 
-#: ../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ūtikuse kliuda:\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"
@@ -1593,13 +1488,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"
@@ -1609,13 +1503,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"
@@ -1624,76 +1517,81 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1343
-#, fuzzy, c-format
+#: ../rpmdrake:1372
+#, fuzzy
 msgid "Please wait, finding available packages..."
 msgstr "Mekleju pīejamuos pakūtnis"
 
-#: ../rpmdrake:1434
-#, fuzzy, c-format
+#: ../rpmdrake:1373
+#, fuzzy
+msgid "Please wait, reading packages database..."
+msgstr "Lyudzu gaidit, gatavoju instalaceju"
+
+#: ../rpmdrake:1528
+#, fuzzy, perl-format
 msgid "Inspecting %s"
 msgstr "Instaleju %s ..."
 
-#: ../rpmdrake:1457
-#, fuzzy, c-format
+#: ../rpmdrake:1551
+#, fuzzy
 msgid "changes:"
 msgstr "Kanali:"
 
-#: ../rpmdrake:1465
-#, fuzzy, c-format
+#: ../rpmdrake:1559
+#, fuzzy, perl-format
 msgid "Remove .%s"
 msgstr "Atvīnoju %s"
 
-#: ../rpmdrake:1469
-#, fuzzy, c-format
+#: ../rpmdrake:1563
+#, fuzzy, perl-format
 msgid "Use .%s as main file"
 msgstr "Lītuot .backupignore failus"
 
-#: ../rpmdrake:1473
-#, fuzzy, c-format
+#: ../rpmdrake:1567
+#, fuzzy
 msgid "Do nothing"
 msgstr "Nikas"
 
-#: ../rpmdrake:1489
-#, fuzzy, c-format
+#: ../rpmdrake:1583
+#, fuzzy
 msgid "Installation finished"
 msgstr "Instalaceja naizadeve"
 
-#: ../rpmdrake:1504
-#, fuzzy, c-format
+#: ../rpmdrake:1598
+#, fuzzy
 msgid "Inspect..."
 msgstr "Savīnoju..."
 
-#: ../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 "Sagatavoju instaleišonu"
 
-#: ../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 "Lyudzu gaidit, gatavoju instalaceju"
 
-#: ../rpmdrake:1556
-#, fuzzy, c-format
+#: ../rpmdrake:1653
+#, fuzzy
 msgid "Unable to get source packages."
 msgstr "Saglobuot dzīšmu sarokstu"
 
-#: ../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"
@@ -1701,38 +1599,38 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1567
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Sagatavoju instaleišonu"
-
-#: ../rpmdrake:1567
-#, fuzzy, c-format
+#: ../rpmdrake:1664
+#, fuzzy
 msgid "Initializing..."
 msgstr "Instaleju %s ..."
 
-#: ../rpmdrake:1576
-#, fuzzy, c-format
+#: ../rpmdrake:1664
+#, fuzzy
+msgid "Package installation..."
+msgstr "Sagatavoju instaleišonu"
+
+#: ../rpmdrake:1673
+#, fuzzy
 msgid "Change medium"
 msgstr "Izmaineit laiku"
 
-#: ../rpmdrake:1577
-#, fuzzy, c-format
+#: ../rpmdrake:1674
+#, fuzzy, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lyudzu īvītojit Atjaunynuošonys moduļu disketi īkuortā %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 "Mekleju uzlobuojamuos pakūtnis"
 
-#: ../rpmdrake:1620
-#, fuzzy, c-format
+#: ../rpmdrake:1717
+#, fuzzy, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1741,13 +1639,12 @@ msgid ""
 "Do you want to continue installation?"
 msgstr "Tiks instaleitys sekuojūšys pakūtnis"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalaceja naizadeve"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1755,23 +1652,22 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1645
-#, fuzzy, c-format
+#: ../rpmdrake:1742
+#, fuzzy
 msgid "Preparing packages installation..."
 msgstr "Sagatavoju instaleišonu"
 
-#: ../rpmdrake:1648
-#, fuzzy, c-format
+#: ../rpmdrake:1745
+#, fuzzy, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaleju pakūtnis..."
 
-#: ../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"
@@ -1779,51 +1675,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 "Stereo (ja pīejams)"
 
-#: ../rpmdrake:1735
-#, fuzzy, c-format
+#: ../rpmdrake:1832
+#, fuzzy
 msgid "No package found for installation."
 msgstr "True Type fontu instaleišona"
 
-#: ../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 "Lyudzu gaidit, gatavoju instalaceju"
-
-#: ../rpmdrake:1809
-#, fuzzy, c-format
+#: ../rpmdrake:1858
+#, fuzzy
 msgid "Please wait, removing packages..."
 msgstr "Nūjamu pakūtnis..."
 
-#: ../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 "Pakūtņu kuortuošonys laikā atkluota kliuda:"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1831,8 +1718,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1840,13 +1727,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"
@@ -1855,214 +1740,181 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Programmaturys puorvaldeišona"
-
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
 msgid "Mandriva Linux Update"
 msgstr "Manuali"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Programmaturys puorvaldeišona"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Lyudzu zemļuok īvodit sovu e-posta adresi"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Lītuotuojs:"
 
-#: ../rpmdrake.pm:170
-#, fuzzy, c-format
+#: ../rpmdrake.pm:172
+#, fuzzy
 msgid "Software Packages Removal"
 msgstr "Programmaturys puorvaldeišona"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Programmaturys puorvaldeišona"
 
-#: ../rpmdrake.pm:172
-#, fuzzy, c-format
+#: ../rpmdrake.pm:174
+#, fuzzy
 msgid "Software Packages Installation"
 msgstr "Saglobuot pakūtņu izvieli"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nā"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:263
-#, fuzzy, c-format
+#: ../rpmdrake.pm:265
+#, fuzzy
 msgid "Info..."
 msgstr "Info"
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Austreja"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Australeja"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Beļgeja"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazīleja"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Šveice"
 
-#: ../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 "Čehejis Republika"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Vuoceja"
 
-#: ../rpmdrake.pm:385
-#, fuzzy, c-format
+#: ../rpmdrake.pm:390
+#, fuzzy
 msgid "Danmark"
 msgstr "Dāneja"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grīkeja"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spāneja"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Sūmeja"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Franceja"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ungareja"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Izraela"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Itāleja"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japuona"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Holande"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvegeja"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Pūleja"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugāle"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Krīveja"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Zvīdreja"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapūra"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakeja"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taivana"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Apvīnuotuo Karaliste"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Kī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 "A.S.V."
 
-#: ../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"
@@ -2070,8 +1922,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"
@@ -2079,23 +1930,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 "lyudzu pagaidit cikom izpyldās ttmkfdir..."
 
-#: ../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 "Kliuda, atjaunojūt izvieļni"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2104,8 +1959,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"
@@ -2114,18 +1969,16 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:538
-#, fuzzy, c-format
+#: ../rpmdrake.pm:554
+#, fuzzy
 msgid "No mirror"
 msgstr "Trūksnis"
 
-#: ../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"
@@ -2134,69 +1987,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 "Izavielejit vālamū drūšeibys leimini?"
 
-#: ../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 "gotovs"
 
-#: ../rpmdrake.pm:632
-#, fuzzy, c-format
+#: ../rpmdrake.pm:648
+#, fuzzy
 msgid " failed!"
 msgstr "Naveiksmeiga pīsateikšona"
 
 #. -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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:656
+#, fuzzy, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Aizveru sistemu..."
 
-#: ../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 "lyudzu pagaidit cikom izpyldās ttmkfdir..."
 
-#: ../rpmdrake.pm:685
-#, fuzzy, c-format
+#: ../rpmdrake.pm:701
+#, fuzzy
 msgid "Error retrieving packages"
 msgstr "Pakūtņu kuortuošonys laikā atkluota kliuda:"
 
-#: ../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"
@@ -2206,34 +2059,33 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, fuzzy, c-format
+#: ../rpmdrake.pm:733
+#, fuzzy
 msgid "Update media"
 msgstr "Modernizeijumi"
 
-#: ../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 "Izavielejit cytu datu nesieju, nu kura atjaunuot"
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr "Izavielēt vysys"
 
-#: ../rpmdrake.pm:747
-#, fuzzy, c-format
+#: ../rpmdrake.pm:763
+#, fuzzy
 msgid "Update"
 msgstr "Modernizeijumi"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2241,55 +2093,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 "Nevar atdalīt: %s"
 
-#: ../rpmdrake.pm:814
-#, fuzzy, c-format
+#: ../rpmdrake.pm:830
+#, fuzzy
 msgid "Unable to create medium."
 msgstr "Nav īspiejams izveiduot mdkupdate medium.\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 ""
@@ -2593,6 +2442,17 @@ msgstr "Nūjimt moduli"
 msgid "Software Media Manager"
 msgstr ""
 
+#~ msgid "Stop"
+#~ msgstr "Apturēt"
+
+#, fuzzy
+#~ msgid "Normal information"
+#~ msgstr "Detalizeita informaceja"
+
+#, fuzzy
+#~ msgid "Maximum information"
+#~ msgstr "Detalizeita informaceja"
+
 #, fuzzy
 #~ msgid "Update medium"
 #~ msgstr "Modernizeijumi"
diff --git a/po/lv.po b/po/lv.po
index 294eb2ce..bf004825 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -10,7 +10,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: 2002-08-11 22:16+0200\n"
 "Last-Translator: Vitauts Stočka <vit@dau.lv>\n"
 "Language-Team: Latvian <cooker-i18n@mandrivalinux.org>\n"
@@ -18,13 +19,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"
@@ -38,18 +37,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 "Parasti jauninājumi"
 
-#: ../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,106 +63,90 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Lūdzu gaidiet, atjuaninu datu nesēju"
 
-#: ../edit-urpm-sources.pl:128
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:130
+#, fuzzy
 msgid "Add a medium"
 msgstr "Pievienoju avotu:"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokālie faili"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Ceļš:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP serveris"
 
-#: ../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 serveris"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP serveris"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Atvienojama ierīce"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Ceļš uz montēšanas punktu:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Atvienojama ierīce"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Pārlūkot..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Lietotājs:"
 
-#: ../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 "Parole:"
 
-#: ../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 "Relatīvais čeļš uz 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 ""
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Vārds:"
 
 #: ../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 ""
 "Lūdzu izvēlieties avotus,\n"
 "kurus vēlaties atnunot:"
 
-#: ../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 "Jums jāaizpilda vismaz pirmie divi ievadlauki."
 
-#: ../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?"
@@ -172,13 +154,13 @@ msgstr ""
 "Jau ir datu nesējs ar šādu vārdu,\n"
 "vai tiešām vēlaties to aizvietot?"
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:239
+#, fuzzy
 msgid "Adding a medium:"
 msgstr "Pievienoju avotu:"
 
-#: ../edit-urpm-sources.pl:244
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:241
+#, fuzzy
 msgid "Type of medium:"
 msgstr "Avota tips:"
 
@@ -186,10 +168,9 @@ msgstr "Avota tips:"
 #: ../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 "Atcelt"
 
@@ -198,101 +179,92 @@ msgstr "Atcelt"
 #: ../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 "Labi"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Tiek sagatavota instalēšana"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "vienmēr"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nekad"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Pakotni neizdodas instalēt"
 
 #: ../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 "Programmatūras pakotņu noņemšana"
 
 #: ../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 "Lūdzu gaidiet, atvienoju datu nesēju..."
 
 #: ../edit-urpm-sources.pl:394
-#, fuzzy, c-format
+#, fuzzy
 msgid "Edit a medium"
 msgstr "Labot avotu"
 
 #: ../edit-urpm-sources.pl:400
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Laboju avotu \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Saglabāt izmaiņas"
 
-#: ../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 "Kļūda..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Jums jāielik datu nesējs, lai turpinātu"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Lai saglabātu izmaiņas, Jums jāieliek datu nesējs iekārtā."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Konfigurēt proxy serverus"
 
 #: ../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
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -301,241 +273,208 @@ msgstr ""
 "<proxy hosts[:ports]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy hosta vārds:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Varat norādīt lietotāja vārdu/paroli priekši proxy autentifikācijas:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Lietotājs:"
 
 #: ../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 "Pievienoju avotu:"
 
 #: ../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 "Laboju avotu \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Grupas nosaukums:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokols:"
 
 #: ../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 "Pievienot"
 
 #: ../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 "Noņemt"
 
 #: ../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 "Grupa"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokols"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokols"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Komanda"
 
-#: ../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 "(neviens)"
 
-#: ../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 "Rediģēt..."
 
-#: ../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 "Pievienot..."
 
 #: ../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 "Vidējs"
 
 #: ../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 "Pievienot..."
 
 #: ../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 "Noņemt programmatūru"
 
 #: ../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 "Pievienot..."
 
 #: ../edit-urpm-sources.pl:852
-#, fuzzy, c-format
+#, fuzzy
 msgid "Remove key"
 msgstr "Noņemt"
 
 #: ../edit-urpm-sources.pl:868
-#, fuzzy, c-format
+#, fuzzy
 msgid "Configure media"
 msgstr "Konfigurēt izejas kodus"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Atļauts?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Atjaunināt"
 
-#: ../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 "Pievienot..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Atjaunināt..."
 
-#: ../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 "Palīdzība"
 
-#: ../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"
@@ -545,8 +484,8 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../edit-urpm-sources.pl:1010
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1024
+#, fuzzy
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -560,8 +499,7 @@ msgstr ""
 "uz Jūsu datora. Tie tad būs pieejami, lai instalētu jaunu programmatūras\n"
 "pakotni, vai lai veiktu jauninājumus."
 
-#: ../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,738 +507,626 @@ 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 "Lietojums: %s [OPCIJAS]..."
 
-#: ../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       - izveidot atjaunināšanas datu nesēju.\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
-#, 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 "Pieejamība"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arhivēšana"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Rezerves kopēšana"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Cd ierakstīšana"
 
-#: ../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 "Cits"
 
-#: ../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 "Cits"
 
-#: ../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 "Komunikācijas"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Datubāzes"
 
-#: ../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 "Attīstība"
-
-#: ../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 "Attīstība"
+
+#: ../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 "Kernels"
 
-#: ../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 "Redaktori"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Izglītība"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Failu rīki"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Spēles"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Piedzīvojumi"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Spēles"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkāde"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Laukumi"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kārtis"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzļi"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sports"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Stratēģija"
 
-#: ../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 ""
 
-#: ../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 "Grafika"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Novērošana"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimēdijas"
 
-#: ../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 "Tīkli"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Pļāpāšana"
 
-#: ../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 "Tīkli"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Failu pārsūtīšana"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Interneta peidžeris"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Pasts"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Jaunumi"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Attāla piekļūšana"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ofiss"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Izdevējdarbība"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Zinātnes"
-
-#: ../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 "Zinātnes"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Bioloģija"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Ķīmija"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Datorzinātne"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Ģeozinātnes"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matemātika"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Čaulas"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Skaņa"
 
-#: ../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 "Sistēma"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Bāze"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfigurācija"
+#: ../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 "Sistēma"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Ielāde un inicializācija"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigurācija"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Dzelži"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakotnes"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Drukāšana"
 
 #
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Izstrāde"
 
 #
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Izstrāde"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fonti"
-
-#: ../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 "Fonti"
+
+#: ../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 "Bibliotēkas"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Serveri"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr ""
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Termināļi"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Teksta rīki"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Rotaļlietas"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, fuzzy, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
+#, fuzzy
 msgid "(Not available)"
 msgstr "(Nav pieejams)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Meklēšanas rezultāti"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Meklēšanas rezultāti (neviens)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Lūdzu gaidiet, meklēju..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, fuzzy, c-format
-msgid "Rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stop"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Pievienojams"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Atjaunināms"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Pievienojams"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Nav izvēlēts"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Izvēlēts"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Nav izvēlēts"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Svarīgums: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Atjaunināšanas iemesls: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "aprakstos"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Faili:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Izmaiņu žurnāls:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Patreiz instalētā versija: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Vārds: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versija: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Apjoms: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Svarīgums: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Apjoms: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Kopsavilkums: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Atjaunināšanas iemesls: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Apraksts: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "aprakstos"
+#. 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 "Vairāk informācijas par pakotni..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Lūdzu izvēlieties"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Lūdzu izvēlieties"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Lūdzu gaidiet, veidoju pakotņu sarakstu..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Nav jauninājuma"
 
-#: ../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"
@@ -1310,29 +1136,25 @@ msgstr ""
 "pieejami atjauninājumi uz Jūsu datora instalētajām pakotnēm,\n"
 "vai arī Jūs tos visus jau esat uzinstalējuši."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Viss"
 
 #. -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 "Vairāk informācijas par pakotni..."
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Nepieciešams noņemt dažas papildus pakotnes"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1342,20 +1164,19 @@ msgstr ""
 "ir nepieciešams noņemt arī sekojoša(s) pakotne(s):\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, fuzzy, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
+#, fuzzy
 msgid "Some packages can't be removed"
 msgstr "Pakotni neizdodas instalēt"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:774 ../rpmdrake:839
-#, fuzzy, c-format
+#: ../rpmdrake:830 ../rpmdrake:895
+#, fuzzy
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1365,13 +1186,11 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Papildus nepieciešamās pakotnes"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1381,18 +1200,18 @@ msgstr ""
 "ir nepieciešams instalēt arī sekojoša(s) pakotne(s):\n"
 "\n"
 
-#: ../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 "Pakotni neizdodas instalēt"
 
-#: ../rpmdrake:823
-#, fuzzy, c-format
+#: ../rpmdrake:879
+#, fuzzy, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1401,123 +1220,114 @@ msgstr ""
 "Atvainojiet, sekojošas pakotnes nevar tikt izvēlētas\"\n"
 "\n"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Dažas pakotnes nepieciešams noņemt"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izvēlēts: %d MB / brīvā diska vieta: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Izvēles apjoms: %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 "Drošības atjauninājumi"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Kļūdu labojumu jauninājumi"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instalēt"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Parasti jauninājumi"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Neinstalēt"
 
-#: ../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 izvēles"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Visas pakotnes, pēc alfabēta"
 
-#: ../rpmdrake:971
-#, fuzzy, c-format
-msgid "All packages, by group"
-msgstr "Visas pakotnes,"
+#: ../rpmdrake:1007
+#, fuzzy
+msgid "All packages, by update availability"
+msgstr "pēc atjauninājuma pieejamības"
 
-#: ../rpmdrake:972
-#, fuzzy, c-format
+#: ../rpmdrake:1008
+#, fuzzy
 msgid "All packages, by size"
 msgstr "Visas pakotnes,"
 
-#: ../rpmdrake:973
-#, fuzzy, c-format
+#: ../rpmdrake:1009
+#, fuzzy
 msgid "All packages, by selection state"
 msgstr "pēc izvēlēšanās statusa"
 
-#: ../rpmdrake:977
-#, fuzzy, c-format
-msgid "All packages, by medium repository"
-msgstr "pēc avota repozitārija"
-
-#: ../rpmdrake:978
-#, fuzzy, c-format
-msgid "All packages, by update availability"
-msgstr "pēc atjauninājuma pieejamības"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+#, fuzzy
+msgid "All packages, by group"
+msgstr "Visas pakotnes,"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Parasti jauninājumi"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Kļūdu labojumu jauninājumi"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Parasti jauninājumi"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Drošības atjauninājumi"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "vārdos"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "aprakstos"
 
-#: ../rpmdrake:1061
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "failos"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Parasta informācija"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maksimāla informācija"
-
 #: ../rpmdrake:1098
-#, fuzzy, c-format
+#, fuzzy
 msgid "You need to select some packages first."
 msgstr "Nebija iespējams saņemt izejas pakotnes."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Izvēlētas pa daudz pakotnes"
 
 #: ../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"
@@ -1534,7 +1344,7 @@ msgstr ""
 "Vai tiešām vēlaties instalēt visas izvēlētās pakotnes?"
 
 #: ../rpmdrake:1117
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1548,89 +1358,105 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../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 "/_Fails"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Atjaunot avotus"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Izvēlēties no jauna"
 
-#: ../rpmdrake:1177
-#, fuzzy, c-format
+#: ../rpmdrake:1173
+#, fuzzy
 msgid "/Reload the _packages list"
 msgstr "Pārlādējiet pakotņu sarakstu"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Iziet"
 
-#: ../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 "/_Opcijas"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, fuzzy, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
+#, fuzzy
 msgid "/_Show automatically selected packages"
 msgstr "Parādīt automātiski izvēlētās pakotnes"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Palīdzība"
 
-#: ../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 atjaunināšana"
+
+#. -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 "Meklēt:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Meklēt"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Attīrīt"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instalēt"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Iziet"
 
-#: ../rpmdrake:1276
-#, fuzzy, c-format
+#: ../rpmdrake:1306
+#, fuzzy
 msgid "Fatal error"
 msgstr "Ierakstīšanas kļūda\n"
 
-#: ../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"
@@ -1643,13 +1469,13 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../rpmdrake:1295
-#, fuzzy, c-format
+#: ../rpmdrake:1323
+#, fuzzy
 msgid "Already existing update media"
 msgstr "Kļūda pievienojot atjaunošanas datu nesēju"
 
-#: ../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"
@@ -1659,13 +1485,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Kā ar rokām izvēlēties spoguļserveri"
 
-#: ../rpmdrake:1307
-#, fuzzy, c-format
+#: ../rpmdrake:1335
+#, fuzzy, 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"
@@ -1679,76 +1504,76 @@ msgstr ""
 "\n"
 "Tad pārstartējiet %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Lūdzu gaidiet, meklēju pieejamās pakotnes..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Lūdzu gaidiet, nolasu pakotņu datubāzi..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Pārbaudu %s"
 
-#: ../rpmdrake:1457
-#, fuzzy, c-format
+#: ../rpmdrake:1551
+#, fuzzy
 msgid "changes:"
 msgstr "Saglabāt izmaiņas"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Noņemt .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Lietojiet .%s kā galveno failu"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Nedarīt neko"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalēšana pabeigta"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Pārbaude..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Visas pieprasītās pakotnes tika veiksmīgi instalētas."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, fuzzy, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
+#, fuzzy
 msgid "Problem during installation"
 msgstr "Instalēšanas laikā radās problēmas"
 
-#: ../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 "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake:1556
-#, fuzzy, c-format
+#: ../rpmdrake:1653
+#, fuzzy
 msgid "Unable to get source packages."
 msgstr "Nebija iespējams saņemt izejas pakotnes."
 
-#: ../rpmdrake:1557
-#, fuzzy, c-format
+#: ../rpmdrake:1654
+#, fuzzy, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Atvainojiet, nebija iespējams paņemt izejas pakotnes."
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1756,38 +1581,36 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1567
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Tiek sagatavota instalēšana"
-
-#: ../rpmdrake:1567
-#, fuzzy, c-format
+#: ../rpmdrake:1664
+#, fuzzy
 msgid "Initializing..."
 msgstr "Instalēju:"
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+#, fuzzy
+msgid "Package installation..."
+msgstr "Tiek sagatavota instalēšana"
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Nomainiet datu nesēju"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:1717
+#, fuzzy, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1801,13 +1624,12 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalēšana neizdevās"
 
-#: ../rpmdrake:1630
-#, fuzzy, c-format
+#: ../rpmdrake:1727
+#, fuzzy, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1817,23 +1639,23 @@ msgstr ""
 "Instalēšana neizdevās, trūkst daži faili.\n"
 "Jūs varbūt vēlaties atjaunināt avotu datubāzi."
 
-#: ../rpmdrake:1645
-#, fuzzy, c-format
+#: ../rpmdrake:1742
+#, fuzzy
 msgid "Preparing packages installation..."
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../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 "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1845,51 +1667,43 @@ msgstr ""
 "Daži konfigurācijas faili tika izveidoti kā `.rpmnew' vai `.rpmsave',\n"
 "jūs varat tagad pārbaudīt dažus, lai veiktu darbības:"
 
-#: ../rpmdrake: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 "Vairāk informācijas par pakotni..."
 
-#: ../rpmdrake:1735
-#, fuzzy, c-format
+#: ../rpmdrake:1832
+#, fuzzy
 msgid "No package found for installation."
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake:1736
-#, fuzzy, c-format
+#: ../rpmdrake:1833
+#, fuzzy
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Lūdzu gaidiet, nolasu pakotņu datubāzi..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Lūdzu gaidiet, noņemu pakotnes..."
 
-#: ../rpmdrake:1820
-#, fuzzy, c-format
+#: ../rpmdrake:1869
+#, fuzzy
 msgid "Problem during removal"
 msgstr "Problēma instalēšanas laikā"
 
-#: ../rpmdrake:1821
-#, fuzzy, c-format
+#: ../rpmdrake:1870
+#, fuzzy, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1901,8 +1715,8 @@ msgstr ""
 "Šis rīks palīdzēs Jums izvēlēties, kuru programmatūru vēlaties\n"
 "noņemt no datora."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1914,13 +1728,11 @@ msgstr ""
 "Šis rīks palīdzēs Jums izvēlēties atjauninājumus, kurus vēlaties\n"
 "instalēt uz datora."
 
-#: ../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"
@@ -1934,214 +1746,179 @@ msgstr ""
 "pakotņu uz CDROM vai DVD. Šis rīks palīdzēs Jums izvēlēties, kuru\n"
 "programmatūru vēlaties instalēt uz Jūsu datora."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Programmatūras pakotņu noņemšana"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux atjaunināšana"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Programmatūras pakotņu noņemšana"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Lūdzu zemāk ievadiet savu epasta adresi"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Lietotājs:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Programmatūras pakotņu noņemšana"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Programmatūras pakotņu noņemšana"
 
-#: ../rpmdrake.pm:172
-#, fuzzy, c-format
+#: ../rpmdrake.pm:174
+#, fuzzy
 msgid "Software Packages Installation"
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nē"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Jā"
 
-#: ../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 "Austrālija"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Beļģija"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazīlija"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanāda"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Šveice"
 
-#: ../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 "Čehija"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Vācija"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Dānija"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grieķija"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spānija"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Somija"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Francija"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ungārija"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Izraēla"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Itālija"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japāna"
 
-#: ../rpmdrake.pm:395
-#, fuzzy, c-format
+#: ../rpmdrake.pm:400
+#, fuzzy
 msgid "Korea"
 msgstr "Piespiest"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Holande"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvēģija"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polija"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugāle"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Krievija"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Zviedrija"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapūra"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovākija"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taivāna"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Apvienotā Karaliste"
 
-#: ../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 "ASV"
 
-#: ../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"
@@ -2154,8 +1931,7 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../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"
@@ -2168,25 +1944,28 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Lūdzu gaidiet, lujuplādēju spoguļserveru sarakstu no Mandriva web vietas."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Lūdzu gaidiet, lujuplādēju spoguļserveru sarakstu no Mandriva web vietas."
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2200,8 +1979,8 @@ msgstr ""
 "Tīkls, vai arī Mandriva web vieta, iespējams, nav pieejami.\n"
 "Lūdzu, mēģiniet vēlreiz vēlāk."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2215,18 +1994,15 @@ msgstr ""
 "Tīkls, vai arī Mandriva web vieta, iespējams, nav pieejami.\n"
 "Lūdzu, mēģiniet vēlreiz vēlāk."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nav spoguļservera"
 
-#: ../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"
@@ -2240,69 +2016,65 @@ msgstr ""
 "ka procesora arhitektūra netiek atbalstīta no Mandriva Linux\n"
 "oficiālo atjauninājumu puses."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Lūdzu izvēlieties spoguļserveri"
 
-#: ../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 "failos"
 
 #. -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 "Lūdzu gaidiet, atjuaninu datu nesēju"
 
-#: ../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"
@@ -2312,36 +2084,33 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, fuzzy, c-format
+#: ../rpmdrake.pm:733
+#, fuzzy
 msgid "Update media"
 msgstr "Atjaunot avotus"
 
-#: ../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 ""
 "Lūdzu izvēlieties avotus,\n"
 "kurus vēlaties atnunot:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Iezīmēt visu"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Atjaunināt"
 
-#: ../rpmdrake.pm:768
-#, fuzzy, c-format
+#: ../rpmdrake.pm:784
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2349,55 +2118,52 @@ msgid ""
 "%s"
 msgstr "Nav iespējams atjaunināt datu nesēju; tas tiks automātiski atslēgts."
 
-#: ../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 "Nevaru izveidot datu nesēju."
 
-#: ../rpmdrake.pm:819
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "Lūdzu gaidiet, pievienoju datu nesēju..."
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
 "%s"
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../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 ""
@@ -2675,6 +2441,19 @@ msgstr "Noņemt programmatūru"
 msgid "Software Media Manager"
 msgstr "Programmatūras avotu pārvaldnieks"
 
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#, fuzzy
+#~ msgid "All packages, by medium repository"
+#~ msgstr "pēc avota repozitārija"
+
+#~ msgid "Normal information"
+#~ msgstr "Parasta informācija"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maksimāla informācija"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "viss tika uzinstalēts korekti"
 
@@ -2816,9 +2595,6 @@ msgstr "Programmatūras avotu pārvaldnieks"
 #~ msgid "The package %s is not signed"
 #~ msgstr "Pakotne %s nav parakstīta"
 
-#~ msgid "Don't install"
-#~ msgstr "Neinstalēt"
-
 #~ msgid "Signature problem"
 #~ msgstr "Paraksta problēma"
 
diff --git a/po/mk.po b/po/mk.po
index 8d5d5722..18b8574d 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-mk\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-07-18 02:01+0200\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -18,13 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.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"
@@ -50,18 +49,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"
@@ -81,104 +78,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 "Пат или точка на монтирање:"
 
-#: ../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?"
@@ -186,13 +164,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 +176,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,101 +187,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 "Потврди ги 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 "Глобални прокси подесувања"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -315,166 +275,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 keyring!"
 
 #: ../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)"
@@ -483,37 +414,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"
@@ -523,38 +448,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"
@@ -564,8 +483,7 @@ msgstr ""
 "\n"
 "Да продолжиме?"
 
-#: ../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 ""
 "да се користат на Вашиот компјутер. Потоа, од тие медиуми ќе може да се\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"
@@ -592,13 +509,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"
@@ -608,18 +535,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"
@@ -627,46 +558,39 @@ 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            поставува режим (инсталирај-install (стандарден), "
 "отстрани-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"
@@ -674,33 +598,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                 принуди да се вклучува како 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"
@@ -710,634 +628,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 "Снимање 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 "Прашања (FAQ)"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Како-да (How-to)"
 
-#: ../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 "Аркадни"
 
-#: ../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 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 "Changelog:\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"
@@ -1347,42 +1148,35 @@ 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"
 "\n"
 msgstr "Заради меѓузависностите, и следниве пакети треба да се отстранат:\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"
@@ -1390,8 +1184,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"
@@ -1401,13 +1194,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"
@@ -1417,18 +1208,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"
@@ -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 "Некои пакети треба да се отстранат"
 
-#: ../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
-#, 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"
@@ -1571,7 +1346,7 @@ msgstr ""
 "Дали навистина сакате да ги инсталирате сите изберени пакети?"
 
 #: ../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"
 "Да продолжиме?"
 
-#: ../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"
@@ -1680,13 +1466,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"
@@ -1702,13 +1487,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"
@@ -1722,58 +1506,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"
@@ -1783,18 +1565,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"
@@ -1806,38 +1587,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"
@@ -1851,13 +1628,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"
@@ -1869,23 +1645,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"
@@ -1897,43 +1672,33 @@ msgstr ""
 "Некои конфигурациони датотеки беа создадени како „.rpmnew“\n"
 "или „.rpmsave“, и понатаму можете да ги испитате:"
 
-#: ../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"
@@ -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 ""
 "Оваа алатка ќе Ви помогне да отстраните некој софтвер од\n"
 "Вашиот компјутер."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1969,13 +1733,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"
@@ -1989,214 +1751,172 @@ 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 "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"
@@ -2208,8 +1928,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"
@@ -2222,25 +1941,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"
@@ -2254,8 +1976,8 @@ msgstr ""
 "Мрежата, или пак веб-сајтот не е достапен/достапна.\n"
 "Ве молиме обидете се подоцна."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2269,18 +1991,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"
@@ -2294,69 +2013,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"
@@ -2373,34 +2087,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"
@@ -2412,8 +2121,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"
@@ -2423,18 +2132,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"
@@ -2444,8 +2151,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"
@@ -2455,8 +2162,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"
@@ -2466,13 +2173,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 ""
@@ -2748,6 +2453,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/mn.po b/po/mn.po
index c53071cf..cd93b267 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bootsplash\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-01-02 01:37+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -14,13 +15,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.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"
@@ -34,18 +33,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"
@@ -56,116 +53,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 ""
 
@@ -173,10 +149,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 +160,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"
@@ -537,8 +456,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 +464,796 @@ 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 "С"
 
-#: ../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 ".desktop"
 
-#: ../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
-#, 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 ""
 
-#: ../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"
+#: ../rpmdrake:258
+msgid "Astronomy"
 msgstr ""
 
-#: ../rpmdrake:247
-#, c-format
-msgid "Astronomy"
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:248
-#, c-format
+#: ../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
+#: ../rpmdrake:268
+msgid "Base"
+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:257
-#, c-format
-msgid "Base"
+#: ../rpmdrake:269
+msgid "Boot and Init"
 msgstr ""
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
 msgid "Configuration"
 msgstr "Тоноглол"
 
-#: ../rpmdrake:258
-#, c-format
-msgid "Boot and Init"
-msgstr ""
-
-#: ../rpmdrake:259
-#, c-format
+#: ../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 ""
 
-#: ../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
+#, fuzzy
+msgid "Importance: "
+msgstr "Цонтууд импортлох"
+
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:553
-#, c-format
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+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 ""
 
-#: ../rpmdrake:579
-#, fuzzy, c-format
-msgid "Importance: "
-msgstr "Цонтууд импортлох"
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Хэмжээ: "
 
-#: ../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 "Тайлбар алга"
-
-#: ../rpmdrake:617 ../rpmdrake:740 ../rpmdrake:742 ../rpmdrake:1719
-#, c-format
-msgid "More information on package..."
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
 msgstr ""
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
+#. - 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
+#: ../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"
 "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"
@@ -1489,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"
@@ -1498,89 +1273,99 @@ 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
-#, 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
+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"
@@ -1588,13 +1373,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"
@@ -1604,13 +1388,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"
@@ -1619,76 +1402,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"
@@ -1696,38 +1476,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
@@ -1736,13 +1512,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 "Хэлбэр!"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1750,23 +1526,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 "`%s' (%s/%s) багцийг суулгаж байна..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "[%s] rpm файл руу хандаж болсонгүй"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1774,51 +1548,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"
@@ -1826,8 +1589,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1835,13 +1598,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"
@@ -1850,214 +1611,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 "Та доор э-шуудангийн хаягаа өгнө үү"
 
-#: ../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"
@@ -2065,8 +1786,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"
@@ -2074,23 +1794,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"
@@ -2099,8 +1821,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"
@@ -2109,18 +1831,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"
@@ -2129,69 +1848,64 @@ 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
-#, 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:656
+#, fuzzy, 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"
@@ -2201,34 +1915,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"
@@ -2236,55 +1945,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 ""
@@ -2559,6 +2264,9 @@ msgstr ""
 msgid "Software Media Manager"
 msgstr ""
 
+#~ msgid "Stop"
+#~ msgstr "Зогсоох"
+
 #~ msgid "/_View"
 #~ msgstr "/_Үзэмж"
 
diff --git a/po/ms.po b/po/ms.po
index 0dd4d8c2..baf0e25f 100644
--- a/po/ms.po
+++ b/po/ms.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-11-26 15:26+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -16,13 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Pilih jenis 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"
@@ -36,18 +35,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 "Sumber edaran"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Kemaskini rasmi"
 
-#: ../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,116 +55,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 "Sila tunggu, menambah media..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Tambah medium"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Fail lokal"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Laluan:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Pelayan 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 "Pelayan FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Pelayan HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Peranti bolehubah"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Path atau titik mount:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Peranti bolehubah"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Lungsur..."
 
-#: ../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 "Katalaluan:"
 
-#: ../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 "Path relatif ke sintesis/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 "Nama:"
 
 #: ../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 "Cari media ini untuk kemaskini"
 
-#: ../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 "Menambah media:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Jenis media:"
 
@@ -175,10 +151,9 @@ msgstr "Jenis 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 "Batal"
 
@@ -187,304 +162,257 @@ msgstr "Batal"
 #: ../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 "Pilihan global untuk pemasangan pakej"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "sentiasa"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "tidak sekali-kali"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Sahkan RPM untuk dipasang:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Muatturun program untuk digunakan:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Membuang Sumber"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Adakah anda pasti untuk memadam sumber \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Sila tunggu, mengeluarkan medium..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Sunting media"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Menyunting media \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Simpan perubahan"
 
-#: ../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 ""
 
 #: ../edit-urpm-sources.pl:434
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Masuk dalam."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Tetapkan proksi"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Tetapan proksi untuk media \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Tetapan proksi global"
 
 #: ../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]>):"
 msgstr "dan<proxyhost[:port]>:"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Namahos proksi:"
 
 #: ../edit-urpm-sources.pl:474
-#, fuzzy, c-format
+#, fuzzy
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "pengguna:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Pengguna:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Tambah kumpulan selari"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Sunting kumpulan selari"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Tambah had medium"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Pilih media untuk menambah didalam had media:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Tambah hos"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Taip namahos atau alamat IP hos untuk ditambah:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Menyunting kumpulan selari \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nama kumpulan:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Had media:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Tambah"
 
 #: ../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 "Buang"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Hos:"
 
 #: ../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 "Kumpulan"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Had media"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Arahan"
 
-#: ../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 "(tiada)"
 
-#: ../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 "Ubah..."
 
-#: ../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 "Tambah..."
 
 #: ../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 "Sederhana"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Kekunci"
 
 #: ../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 "Tambah kekunci"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Pilih kekunci untuk ditambah ke dalam media %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Buang kekunci"
 
 #: ../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 "Tambah kekunci..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Buang kekunci"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Tetapkan media"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Hidupkan?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Kemaskini?"
 
-#: ../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"
@@ -494,38 +422,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Tambah custom..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Kemaskini..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Urus kekunci..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Selari..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Pilihan global..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Pertolongan"
 
-#: ../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"
@@ -535,8 +457,8 @@ msgstr ""
 "\n"
 "Adakah ok untuk meneruskan?"
 
-#: ../edit-urpm-sources.pl:1010
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1024
+#, fuzzy
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -545,8 +467,7 @@ msgid ""
 "or to perform updates."
 msgstr "Selamat Datang on."
 
-#: ../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"
@@ -554,765 +475,651 @@ 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
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Berjaya menambah media `%s'."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Berjaya menambah media `%s'."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Penggunaan: %s [PILIHAN]..."
 
-#: ../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 "  --no-media-update      jangan kemaskini media ketika permulaan"
 
-#: ../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 "  --root                 paksa untuk laksana sebagai root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           laksana carian untuk \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Melaksanakan dalam mod pengguna"
 
-#: ../rpmdrake:179
-#, fuzzy, c-format
+#: ../rpmdrake:189
+#, fuzzy
 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 "normal pengguna on."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Kebolehcapaian"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Mengarkib"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Sandaran"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Menulis CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Mampatan"
 
-#: ../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 "Lain-lain"
 
-#: ../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 "Buku"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Buku komputer"
 
-#: ../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 "Kesusasteraan"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Gugusan"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Pemindahan Mesej"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Servis Giliran"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikasi"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "PangkalanData"
 
-#: ../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 "Pemaju"
-
-#: ../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 "Pemaju"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME dan GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE dan 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 "Penyunting"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Pendidikan"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulator"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Alatan fail"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Permainan"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Pengembaraan"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Permainan"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arked"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Papan"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kad"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Tekasuai"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sukan"
 
-#: ../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 "Desktop bergrafik"
-
-#: ../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 bergrafik"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Berasaskan 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 "Grafik"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Pemerhatian"
 
-#: ../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 "Rangkaian"
-
-#: ../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 "Rangkaian"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Pemindahan fail"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Pesanan segera"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Mel"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Berita"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Akses jauh"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Pejabat"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Kekunci Awam"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Penerbitan"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Sains"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Falak"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Sains"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr ""
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kimia"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Sains komputer"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geosains"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematik"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr ""
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Bunyi"
 
-#: ../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 "Asas"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Penyelarasan"
+#: ../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 "Boot dan Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Penyelarasan"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Perkakasan"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakejan"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Cetakan"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Pengagihan"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Pengagihan"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Font"
-
-#: ../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 "Font"
+
+#: ../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 ""
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel dan perkakasan"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Pustaka"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Pelayan"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminal"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Alatan teks"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Permainan"
 
-#: ../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 "(Tiada)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Hasil carian"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Keputusan carian (tiada)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Sila tunggu, mencari..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Henti"
+#: ../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 "Tidak dipilih"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Dipilih "
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Tidak dipilih"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr ""
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Sebab untuk kemaskini:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Tiada keterangan"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fail:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Media:"
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versi dipasang semasa:"
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nama: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versi: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Rekabentuk:"
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Saiz: "
-
-#: ../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 "Saiz: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Ringkasan: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Sebab untuk kemaskini:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Huraian: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Tiada keterangan"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../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 "Lebih maklumat pada pakej %s"
 
-#: ../rpmdrake:618
-#, fuzzy, c-format
-msgid "Please choose"
-msgstr "Pilih secara manual"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../rpmdrake:639
-#, fuzzy, c-format
+#: ../rpmdrake:672
+#, fuzzy
+msgid "Please choose"
+msgstr "Pilih secara manual"
+
+#: ../rpmdrake:695
+#, fuzzy
 msgid "Please wait, listing packages..."
 msgstr "Memuatkan Tetapan... Sila tunggu"
 
-#: ../rpmdrake:657
-#, fuzzy, c-format
+#: ../rpmdrake:713
+#, fuzzy
 msgid "No update"
 msgstr "Kemaskini Sistem"
 
-#: ../rpmdrake:658
-#, fuzzy, c-format
+#: ../rpmdrake:714
+#, fuzzy
 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 "on."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Semua"
 
 #. -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 "Lebih Maklumat"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, fuzzy, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
+#, fuzzy
 msgid "Information on packages"
 msgstr "Lebih maklumat pada pakej %s"
 
-#: ../rpmdrake:757
-#, fuzzy, c-format
+#: ../rpmdrake:813
+#, fuzzy
 msgid "Some additional packages need to be removed"
 msgstr "Pakej-pakej ini perlu diinstal dulu agar semuanya dapat berjalan baik."
 
-#: ../rpmdrake:758
-#, fuzzy, c-format
+#: ../rpmdrake:814
+#, fuzzy
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1321,174 +1128,173 @@ msgstr ""
 "Untuk memenuhi kebergantungan,\n"
 "Pakej-pakej berikut akan dihapus:"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, fuzzy, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
+#, fuzzy
 msgid "Some packages can't be removed"
 msgstr "Peranti gelungbalik tidak boleh dibuang!"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:859
+#, fuzzy
 msgid "Additional packages needed"
 msgstr "\"%s\" cakera %d diperlukan untuk memasang pakej"
 
-#: ../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 "Kepada"
 
-#: ../rpmdrake:819
-#, fuzzy, c-format
+#: ../rpmdrake:875
+#, fuzzy, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "gagal baca senarai fail \"%s\""
 
-#: ../rpmdrake:822
-#, fuzzy, c-format
+#: ../rpmdrake:878
+#, fuzzy
 msgid "Some packages can't be installed"
 msgstr "_Personalisasikan pakej perisian untuk dipasang"
 
-#: ../rpmdrake:823
-#, fuzzy, c-format
+#: ../rpmdrake:879
+#, fuzzy, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 "%s"
 msgstr "Pakej `%s' tidak boleh diinstal\n"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, fuzzy, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
+#, fuzzy
 msgid "Some packages need to be removed"
 msgstr "_Kekalkan pakej yang kini tersenarai untuk dibuang"
 
-#: ../rpmdrake:863
-#, fuzzy, c-format
+#: ../rpmdrake:919
+#, fuzzy, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Bebas"
 
-#: ../rpmdrake:864
-#, fuzzy, c-format
+#: ../rpmdrake:920
+#, fuzzy, perl-format
 msgid "Selected size: %d MB"
 msgstr "Saiz dicadangkan (MB):"
 
-#: ../rpmdrake:870
-#, fuzzy, 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
+#, fuzzy
 msgid "Description not available for this package\n"
 msgstr "Tiada status tersedia utk pakej ini\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Kemaskini sekuriti"
-
-#: ../rpmdrake:939
-#, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "Kemaskini Cakera"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Install"
 
-#: ../rpmdrake:939
-#, fuzzy, c-format
-msgid "Normal updates"
-msgstr "Kemaskini Cakera"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Install"
 
-#: ../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 "SELAMAT DATANG - Mandriva Linux %s"
 
-#: ../rpmdrake:963
-#, fuzzy, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
+#, fuzzy
 msgid "All packages, alphabetical"
 msgstr "_Pilih pakej individu"
 
-#: ../rpmdrake:971
-#, fuzzy, c-format
-msgid "All packages, by group"
-msgstr "Pilih _semua dalam kumpulan"
+#: ../rpmdrake:1007
+#, fuzzy
+msgid "All packages, by update availability"
+msgstr "Semua"
 
-#: ../rpmdrake:972
-#, fuzzy, c-format
+#: ../rpmdrake:1008
+#, fuzzy
 msgid "All packages, by size"
 msgstr "G&una saiz sama untuk semua elemen"
 
-#: ../rpmdrake:973
-#, fuzzy, c-format
+#: ../rpmdrake:1009
+#, fuzzy
 msgid "All packages, by selection state"
 msgstr "Semua"
 
-#: ../rpmdrake:977
-#, fuzzy, c-format
-msgid "All packages, by medium repository"
-msgstr "Semua"
-
-#: ../rpmdrake:978
-#, fuzzy, c-format
-msgid "All packages, by update availability"
-msgstr "Semua"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy, c-format
+#: ../rpmdrake:1011
+#, fuzzy
+msgid "All packages, by group"
+msgstr "Pilih _semua dalam kumpulan"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Kemaskini Cakera"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "Bugfixes updates"
+msgstr "Kemaskini Cakera"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "Normal updates"
+msgstr "Kemaskini Cakera"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Kemaskini sekuriti"
+
+#: ../rpmdrake:1068
+#, fuzzy
 msgid "in names"
 msgstr "Nama Trek:"
 
-#: ../rpmdrake:1059
-#, fuzzy, c-format
+#: ../rpmdrake:1070
+#, fuzzy
 msgid "in descriptions"
 msgstr "Sedang dilaksanakan...   "
 
-#: ../rpmdrake:1061
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "akhir fail tidak dijangka dalam %s\n"
 
-#: ../rpmdrake:1070
-#, fuzzy, c-format
-msgid "Normal information"
-msgstr "Maklumat tidak sah"
-
-#: ../rpmdrake:1070
-#, fuzzy, c-format
-msgid "Maximum information"
-msgstr "Maklumat tidak sah"
-
 #: ../rpmdrake:1098
-#, fuzzy, c-format
+#, fuzzy
 msgid "You need to select some packages first."
 msgstr "Pakej rosak, tidak boleh dibaca/dicari"
 
 #: ../rpmdrake:1103
-#, fuzzy, c-format
+#, fuzzy
 msgid "Too many packages are selected"
 msgstr "Pakej ini sudah diinstal sebelumnya"
 
 #: ../rpmdrake:1104
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -1499,7 +1305,7 @@ msgid ""
 msgstr "Amaran keluar dan?"
 
 #: ../rpmdrake:1117
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1513,91 +1319,106 @@ msgstr ""
 "\n"
 "Adakah anda ingin teruskan (langkui pakej ini)?"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Pilihan Bahasa"
 
-#: ../rpmdrake:1177
-#, fuzzy, c-format
+#: ../rpmdrake:1173
+#, fuzzy
 msgid "/Reload the _packages list"
 msgstr "penggunaan:   %s --list [nama]\n"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Keluar"
 
-#: ../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 "/_Pilihan"
 
-#: ../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 "/_Bantuan"
 
-#: ../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 "Cari:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Cari"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Kosongkan"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Install"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../rpmdrake:1276
-#, fuzzy, c-format
+#: ../rpmdrake:1306
+#, fuzzy
 msgid "Fatal error"
 msgstr "Ralat Maut"
 
-#: ../rpmdrake:1277
-#, fuzzy, c-format
+#: ../rpmdrake:1307
+#, fuzzy, perl-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 "Ralat OS yang tidak dijangka berlaku:\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"
@@ -1605,13 +1426,13 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1295
-#, fuzzy, c-format
+#: ../rpmdrake:1323
+#, fuzzy
 msgid "Already existing update media"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../rpmdrake:1296
-#, fuzzy, c-format
+#: ../rpmdrake:1324
+#, fuzzy, 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"
@@ -1621,13 +1442,13 @@ msgid ""
 "Then, restart %s."
 msgstr "dimatikan dalam ulanghidup."
 
-#: ../rpmdrake:1306
-#, fuzzy, c-format
+#: ../rpmdrake:1334
+#, fuzzy
 msgid "How to choose manually your mirror"
 msgstr "secara manual"
 
-#: ../rpmdrake:1307
-#, fuzzy, c-format
+#: ../rpmdrake:1335
+#, fuzzy, 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"
@@ -1636,58 +1457,63 @@ msgid ""
 "Then, restart %s."
 msgstr "secara manual dan Keselamatan ulanghidup."
 
-#: ../rpmdrake:1343
-#, fuzzy, c-format
+#: ../rpmdrake:1372
+#, fuzzy
 msgid "Please wait, finding available packages..."
 msgstr "muat ulang senarai pakej yg tersedia"
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr ""
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1457
-#, fuzzy, c-format
+#: ../rpmdrake:1551
+#, fuzzy
 msgid "changes:"
 msgstr "Terap perubahan"
 
-#: ../rpmdrake:1465
-#, fuzzy, c-format
+#: ../rpmdrake:1559
+#, fuzzy, perl-format
 msgid "Remove .%s"
 msgstr "_Buang"
 
-#: ../rpmdrake:1469
-#, fuzzy, c-format
+#: ../rpmdrake:1563
+#, fuzzy, perl-format
 msgid "Use .%s as main file"
 msgstr "Guna format fail Microsoft® Excel"
 
-#: ../rpmdrake:1473
-#, fuzzy, c-format
+#: ../rpmdrake:1567
+#, fuzzy
 msgid "Do nothing"
 msgstr "Janga_n Simpan"
 
-#: ../rpmdrake:1489
-#, fuzzy, c-format
+#: ../rpmdrake:1583
+#, fuzzy
 msgid "Installation finished"
 msgstr "Pemasangan selesai"
 
-#: ../rpmdrake:1504
-#, fuzzy, c-format
+#: ../rpmdrake:1598
+#, fuzzy
 msgid "Inspect..."
 msgstr "Gst-inspect"
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, fuzzy, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
+#, fuzzy
 msgid "All requested packages were installed successfully."
 msgstr "Semua."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, fuzzy, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
+#, fuzzy
 msgid "Problem during installation"
 msgstr "%s %s pemasangan pada hos %s"
 
-#: ../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"
@@ -1697,18 +1523,18 @@ msgstr ""
 "ke giliran '%s':\n"
 "\n"
 
-#: ../rpmdrake:1556
-#, fuzzy, c-format
+#: ../rpmdrake:1653
+#, fuzzy
 msgid "Unable to get source packages."
 msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../rpmdrake:1557
-#, fuzzy, c-format
+#: ../rpmdrake:1654
+#, fuzzy, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, fuzzy, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, fuzzy, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1718,38 +1544,37 @@ msgstr ""
 "\n"
 "ralat membaca pilihan\n"
 
-#: ../rpmdrake:1567
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "Pemasangan pakej..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Persediaan..."
 
-#: ../rpmdrake:1576
-#, fuzzy, c-format
+#: ../rpmdrake:1664
+#, fuzzy
+msgid "Package installation..."
+msgstr "Pemasangan pakej..."
+
+#: ../rpmdrake:1673
+#, fuzzy
 msgid "Change medium"
 msgstr "Tambah medium"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Masukkan media \"%s\" ke peranti [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Muatturun pakej `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, fuzzy, c-format
+#: ../rpmdrake:1704
+#, fuzzy
 msgid "Verifying package signatures..."
 msgstr "Membaca maklumat pakej..."
 
-#: ../rpmdrake:1620
-#, fuzzy, c-format
+#: ../rpmdrake:1717
+#, fuzzy, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1762,13 +1587,12 @@ msgstr ""
 "\n"
 "Adakah anda hendak meneruskan pemasangan ?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
-#: ../rpmdrake:1630
-#, fuzzy, c-format
+#: ../rpmdrake:1727
+#, fuzzy, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1776,23 +1600,23 @@ msgid ""
 "You may want to update your media database."
 msgstr "fail."
 
-#: ../rpmdrake:1645
-#, fuzzy, c-format
+#: ../rpmdrake:1742
+#, fuzzy
 msgid "Preparing packages installation..."
 msgstr "%d pakej bergilir untuk dipasang\n"
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "gagal akses fail rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1800,43 +1624,37 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr "fail dalam:"
 
-#: ../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 "Lebih maklumat pada pakej %s"
 
-#: ../rpmdrake:1735
-#, fuzzy, c-format
+#: ../rpmdrake:1832
+#, fuzzy
 msgid "No package found for installation."
 msgstr "%d pakej bergilir untuk dipasang\n"
 
-#: ../rpmdrake:1736
-#, fuzzy, c-format
+#: ../rpmdrake:1833
+#, fuzzy
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "ralat tidak."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr ""
-
-#: ../rpmdrake:1809
-#, fuzzy, c-format
+#: ../rpmdrake:1858
+#, fuzzy
 msgid "Please wait, removing packages..."
 msgstr "Sila tunggu, mengeluarkan medium..."
 
-#: ../rpmdrake:1820
-#, fuzzy, c-format
+#: ../rpmdrake:1869
+#, fuzzy
 msgid "Problem during removal"
 msgstr "Pembuangan Pakej Selesai"
 
-#: ../rpmdrake:1821
-#, fuzzy, c-format
+#: ../rpmdrake:1870
+#, fuzzy, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1846,8 +1664,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, fuzzy, c-format
+#: ../rpmdrake:1905
+#, fuzzy
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1855,8 +1673,8 @@ msgid ""
 "your computer."
 msgstr "Selamat Datang."
 
-#: ../rpmdrake:1861
-#, fuzzy, c-format
+#: ../rpmdrake:1910
+#, fuzzy, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1864,13 +1682,13 @@ msgid ""
 "computer."
 msgstr "Selamat Datang on."
 
-#: ../rpmdrake:1866
-#, fuzzy, c-format
+#: ../rpmdrake:1915
+#, fuzzy
 msgid "Welcome to the software installation tool!"
 msgstr "Selamat Datang ke Alat Penyelarasan Pelayan CUPS"
 
-#: ../rpmdrake:1867
-#, fuzzy, c-format
+#: ../rpmdrake:1916
+#, fuzzy
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1879,214 +1697,177 @@ msgid ""
 "you want to install on your computer."
 msgstr "Selamat Datang on on."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Kemaskini Sistem"
-
-#: ../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 "Kemaskini Sistem"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Masukkan kalimat kunci utk %s@%s:"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Nama pengguna:"
 
-#: ../rpmdrake.pm:170
-#, fuzzy, c-format
+#: ../rpmdrake.pm:172
+#, fuzzy
 msgid "Software Packages Removal"
 msgstr "_Pasang pakej perisian default"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "_Pasang pakej perisian default"
 
-#: ../rpmdrake.pm:172
-#, fuzzy, c-format
+#: ../rpmdrake.pm:174
+#, fuzzy
 msgid "Software Packages Installation"
 msgstr "Masukkan keterangan bagi pemasangan perisian."
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Tidak"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ya"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Maklumat..."
 
-#: ../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 "Belgium"
 
-#: ../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 "Switzerland"
 
-#: ../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 "Republik Czech"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Jerman"
 
-#: ../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 "Greek"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Sepanyol"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Perancis"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hungary"
 
-#: ../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 "Jepun"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Belanda"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norway"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Poland"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Russia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../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 "United Kingdom"
 
-#: ../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 "Amerika Syarikat"
 
-#: ../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"
@@ -2094,8 +1875,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"
@@ -2103,23 +1883,26 @@ 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 "Penmeriksaan kebergantungan..."
 
-#: ../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 "Ralat semasa muatturun"
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2128,8 +1911,8 @@ msgid ""
 "Please try again later."
 msgstr "ralat."
 
-#: ../rpmdrake.pm:529
-#, fuzzy, c-format
+#: ../rpmdrake.pm:544
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2138,18 +1921,17 @@ msgid ""
 "Please try again later."
 msgstr "ralat."
 
-#: ../rpmdrake.pm:538
-#, fuzzy, c-format
+#: ../rpmdrake.pm:554
+#, fuzzy
 msgid "No mirror"
 msgstr "Tiada katalaluan"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:541
-#, fuzzy, c-format
+#: ../rpmdrake.pm:557
+#, fuzzy
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2158,69 +1940,67 @@ msgid ""
 "by Mandriva Linux Official Updates."
 msgstr "Kemaskini."
 
-#: ../rpmdrake.pm:560
-#, fuzzy, c-format
+#: ../rpmdrake.pm:576
+#, fuzzy
 msgid "Please choose the desired mirror."
 msgstr "Sila pilih jenis logmasuk anda:"
 
-#: ../rpmdrake.pm:618
-#, fuzzy, c-format
+#: ../rpmdrake.pm:634
+#, fuzzy, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "menulis senarai fail untuk media \"%s\""
 
-#: ../rpmdrake.pm:621
-#, fuzzy, c-format
+#: ../rpmdrake.pm:637
+#, fuzzy, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "periksa file sintesis [%s]"
 
-#: ../rpmdrake.pm:624
-#, fuzzy, c-format
+#: ../rpmdrake.pm:640
+#, fuzzy, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Dari Fail Jauh (SSH)"
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " selesai."
 
-#: ../rpmdrake.pm:632
-#, fuzzy, c-format
+#: ../rpmdrake.pm:648
+#, fuzzy
 msgid " failed!"
 msgstr "GAGAL"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:636
-#, fuzzy, c-format
+#: ../rpmdrake.pm:652
+#, fuzzy, perl-format
 msgid "%s from medium %s"
 msgstr "membaca pengepala dari media \"%s\""
 
-#: ../rpmdrake.pm:640
-#, fuzzy, c-format
+#: ../rpmdrake.pm:656
+#, fuzzy, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Memulakan VNC..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:647
-#, fuzzy, c-format
+#: ../rpmdrake.pm:663
+#, fuzzy, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Kelajuan Failover"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Sila tunggu, mengemaskini media..."
 
-#: ../rpmdrake.pm:685
-#, fuzzy, c-format
+#: ../rpmdrake.pm:701
+#, fuzzy
 msgid "Error retrieving packages"
 msgstr "Ralat memasang pakej"
 
-#: ../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"
@@ -2230,34 +2010,32 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, fuzzy, c-format
+#: ../rpmdrake.pm:733
+#, fuzzy
 msgid "Update media"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../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 "Pilih perkara yang anda hendak ubahsuai "
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr "  -a             - pilih semua media.\n"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Kemaskini"
 
-#: ../rpmdrake.pm:768
-#, fuzzy, c-format
+#: ../rpmdrake.pm:784
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2265,26 +2043,26 @@ msgid ""
 "%s"
 msgstr "dimatikan"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:830
+#, fuzzy
 msgid "Unable to create medium."
 msgstr "gagal membuat media \"%s\"\n"
 
-#: ../rpmdrake.pm:819
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "Pilih kekunci untuk ditambah ke dalam media %s"
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2294,29 +2072,29 @@ msgstr ""
 "ke giliran '%s':\n"
 "\n"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:869
+#, fuzzy
 msgid "Help launched in background"
 msgstr "fail bantuan pemasangan dalam pelbagai bahasa"
 
-#: ../rpmdrake.pm:853
-#, fuzzy, c-format
+#: ../rpmdrake.pm:870
+#, fuzzy
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "on."
@@ -2591,3 +2369,18 @@ msgstr "Buang Perisian"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Pengurus Media Perisian"
+
+#~ msgid "Stop"
+#~ msgstr "Henti"
+
+#, fuzzy
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Semua"
+
+#, fuzzy
+#~ msgid "Normal information"
+#~ msgstr "Maklumat tidak sah"
+
+#, fuzzy
+#~ msgid "Maximum information"
+#~ msgstr "Maklumat tidak sah"
diff --git a/po/mt.po b/po/mt.po
index 22d994f6..43abc801 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -10,7 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mt\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-03 19:13+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -19,13 +20,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"
@@ -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 "Aġġornamenti normali"
 
-#: ../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"
 "Nista' nkompli?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Stenna ftit, qed jiġu aġġornati l-medji..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Żid sors"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Fajls lokali"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Direttorju:"
 
-#: ../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 "Apparat jinħareġ"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Direttorju jew punt ta' mmuntar:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Apparat jinħareġ"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Fittex..."
 
-#: ../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 "Direttorju relattiv għas-sintesi jew hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Jekk tħallih vojt, is-sinteżi/hdlist jinstab awtomatikament"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Isem:"
 
 #: ../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 "Agħżel is-sorsi li trid taġġorna:"
 
-#: ../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 "Trid timla tal-inqas l-ewwel żewġ elementi."
 
-#: ../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 ""
 "Diġà hemm medju b'dak l-isem, żgur li trid\n"
 "tibdlu ma' dan?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Qed jiġi miżjud sors:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tip ta' sors:"
 
@@ -184,10 +163,9 @@ msgstr "Tip ta' sors:"
 #: ../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 "Ikkanċella"
 
@@ -196,101 +174,90 @@ msgstr "Ikkanċella"
 #: ../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 "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, fuzzy, c-format
+#, fuzzy
 msgid "never"
 msgstr "Servers"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Xi pakketti ma jistgħux jiġu nstallati"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Tniżżil ta’ \"%s\", veloċità: %s"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Tneħħija ta' sors"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Żgur li trid tneħħi s-sors \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Stenna ftit, qed jitneħħa l-medju..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Editja sors"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Editja s-sors \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Ikteb bidliet"
 
-#: ../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 "Trid iddaħħal id-diska biex tkompli"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Sabiex tikteb il-bidliet, trid iddaħħal id-diska fid-drajv"
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Ikkonfigura proxies"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Setings tal-proxy għas-sors \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Setings tal-proxy globali"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -299,166 +266,137 @@ msgstr ""
 "<kompjuterproxy[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Kompjuter tal-proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Trid tispeċifika user/password għall-awtenitikazzjoni tal-proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "User:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Żid grupp parallel"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Biddel grupp parallel"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Żid limitu tas-sors"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Agħżel sors biex iżżid mal-limitu tas-sorsi:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Żid kompjuter"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Ittajpja l-isem jew indirizz IP tal-kompjuter li trid iżżid:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editja l-grupp parallel \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Isem il-grupp:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Limitu tas-sors:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Żid"
 
 #: ../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 "Neħħi"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Kompjuters:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ikkonfigura urpmi parallel (eżekuzzjoni distribwita ta’ urpmi)"
 
 #: ../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 "Limitu tas-sors"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokoll"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Kmand"
 
-#: ../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 "(ebda)"
 
-#: ../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 "Editja..."
 
-#: ../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 "Żid..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Immaniġġja ċifrarji għall-firem diġitali tal-pakketti"
 
-#: ../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 "Sors"
 
 #: ../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 "ebda isem ma nstab, muftieħ ma nstabx fil-\"keyring\" tal-rpm."
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Żid ċifrarju"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Agħżel ċifrarju biex iżżid mas-sors %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Neħħi ċifrarju"
 
 #: ../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)"
@@ -467,37 +405,32 @@ msgstr ""
 "(isem il-key: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Żid ċifrarju..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Neħħi ċifrarju"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Ikkonfigura sors"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Mixgħul?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Aġġorna"
 
-#: ../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"
@@ -507,38 +440,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "Żid..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Aġġorna..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Immaniġġja ċifrarji..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parallel..."
 
-#: ../edit-urpm-sources.pl:984
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:998
+#, fuzzy
 msgid "Global options..."
 msgstr "Setings tal-proxy globali"
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Għajnuna"
 
-#: ../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"
@@ -548,8 +477,7 @@ msgstr ""
 "\n"
 "Trid li nkomplu?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -564,8 +492,7 @@ msgstr ""
 "fuq il-kompjuter tiegħek. Dawn ikunu disponibbli biex minnhom tinstalla \n"
 "pakketti ġodda jew biex taġġorna s-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"
@@ -577,13 +504,23 @@ msgstr ""
 "kopja oħra ta' dan il-programm fuq desktop ieħor, jew qed tinstalla\n"
 "pakketti fl-istess ħin?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Ma nistax inżid sors, argumenti nieqsa jew ħżiena"
 
-#: ../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 ""
+"Int se żżid sors ġdid tal-pakketti, \"%s\".\n"
+"Dan ifisser li tkun tista' żżid pakketti ta' softwer ġodda mas-\n"
+"sistema minn dawn is-sors ġdid."
+
+#: ../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"
@@ -593,91 +530,85 @@ msgstr ""
 "Dan ifisser li tkun tista' żżid pakketti ta' softwer ġodda mas-\n"
 "sistema minn dawn is-sors ġdid."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Ġie miżjud is-sors \"%s\"."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Ġie miżjud is-sors \"%s\"."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Użu: %s [GĦAŻLIET]..."
 
-#: ../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       - uża s-sorsi ta' aġġornament biss.\n"
 
-#: ../rpmdrake:42
-#, fuzzy, c-format
+#: ../rpmdrake:45
+#, fuzzy
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\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"
 "                    Rapport tad-daemon 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 "Modalità user"
 
-#: ../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"
@@ -687,634 +618,518 @@ msgstr ""
 "Ma tkunx tista’ tagħmel tibdiliet lis-sistema, imma xorta\n"
 "tista’ tara d-database eżistenti."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Aċċessibbiltà"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arkivji"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Kopji ta’ sigurtà"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Ħruq ta' CDs"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Kompressjoni"
 
-#: ../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 "Oħrajn"
 
-#: ../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 "Kotba"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Kotba tal-kompjuter"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Mistoqsijiet komuni"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Kif tagħmel (howto)"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Letteratura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Mogħdija ta' messaġġi"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Servizzi ta' kju"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Kommunikazzjoni"
 
-#: ../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 "Żvilupp"
-
-#: ../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 "Żvilupp"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME u GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE u 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 "Edituri"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Edukazzjoni"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulaturi"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Għodda tal-fajls"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Logħob"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Avventura"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Logħob"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Boards"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Karti"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Taħbil il-moħħ"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sports"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strateġija"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Desktop grafiku"
-
-#: ../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 grafiku"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Ibbażat fuq 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 "Monitoraġġ"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimedja"
 
-#: ../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 "Networking"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Taħdit"
 
-#: ../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 "Networking"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Trasferiment ta’ fajls"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Messaġġi instantanji"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Imejl"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Aħbarijiet"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Aċċess remot"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Uffiċċju"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Ċifrarji pubbliċi"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Pubblikazzjoni"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Xjenza"
-
-#: ../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 "Xjenza"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Bioloġija"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kimika"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Xjenza tal-kompjuter"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Xjenzi ġeoloġiċi"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fiżika"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Awdjo"
 
-#: ../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 "Bażi"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfigurazzjoni"
+#: ../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 "Xegħil (boot u init)"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigurazzjoni"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Ħardwer"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakkettjar"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Printjar"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Deployment"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Deployment"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fonts"
-
-#: ../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 "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 "Bitmap X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internazzjonalizzazzjoni"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel u ħardwer"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Libreriji"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servers"
 
-#: ../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 "Għodda tat-test"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Ġugarelli"
 
-#: ../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 "(Mhux disponibbli)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Riżultat tat-tfittxija"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Riżultat tat-tfittxija (ebda)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Stenna ftit, qed infittex..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Ieqaf"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Jistgħu jiġu miżjuda"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Jistgħu jiġu aġġornati"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Jistgħu jiġu miżjuda"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Mhux magħżulin"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Magħżul"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Mhux magħżulin"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importanza: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Raġuni għall-aġġornament: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "fid-deskrizzjonijiet"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fajls:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Log tal-bidliet:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Sors:"
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Verżjoni nstallata bħalissa: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Isem: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Verżjoni: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Daqs: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Importanza: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Daqs: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Sommarju: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Raġuni għall-aġġornament: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Deskrizzjoni: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "fid-deskrizzjonijiet"
+#. 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 "Iżjed tagħrif dwar il-pakkett..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Jekk jogħġbok agħżel wieħed"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Jekk jogħġbok agħżel wieħed"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Stenna ftit, qed jiġu llistjati l-pakketti..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Ebda aġġornament"
 
-#: ../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"
@@ -1324,29 +1139,24 @@ msgstr ""
 "aġġornamenti x'isiru għall-pakketti installati fuq il-kompjuter, jew diġà "
 "nstallajthom kollha."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Kollha"
 
 #. -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 "Iżjed tagħrif"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Tagħrif dwar il-pakketti"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Xi pakketti oħra jridu jitneħħew"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1355,13 +1165,11 @@ msgstr ""
 "Minħabba d-dipendenzi tagħhom, dawn il-pakketti wkoll iridu jitneħħew:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Xi pakketti ma jistgħux jitneħħew"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1369,8 +1177,7 @@ msgstr ""
 "Jiddispjaċini, jekk tneħħi dawn il-pakketti s-sistema ma tibqax taħdem:\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"
@@ -1380,13 +1187,11 @@ msgstr ""
 "mill-għażla issa:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Pakketti oħra meħtieġa"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1396,18 +1201,17 @@ msgstr ""
 "jiġu nstallati:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (qiegħed fil-lista li jinqabżu)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Xi pakketti ma jistgħux jiġu nstallati"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1417,123 +1221,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Xi pakketti jridu jitneħħew"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Magħżula: %d MB / Spazju disponibbli: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Daqs magħżula: %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 "M'hemmx deskrizzjoni għal dan il-pakkett\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Aġġornamenti ta' sigurtà"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Tiswijiet ta' bugs"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Installa"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Aġġornamenti normali"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Installa"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Għażliet ta' 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 "Pakketti kollha, alfabetiċi"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Pakketti kollha, skond il-grupp"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Pakketti kollha, skond id-disponibbiltà ta' aġġornament"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Pakketti kollha, skond id-daqs"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Pakketti kollha, skond l-istat tal-għażla"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Pakketti kollha, skond ir-repożitorju tas-sors"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Pakketti kollha, skond id-disponibbiltà ta' aġġornament"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Pakketti biss, skond id-data ta' installazzjoni"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Pakketti kollha, skond il-grupp"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Aġġornamenti normali"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Tiswijiet ta' bugs"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Aġġornamenti normali"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Aġġornamenti ta' sigurtà"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "fl-ismijiet"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "fid-deskrizzjonijiet"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "fl-ismijiet tal-fajls"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informazzjoni normali"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Informazzjoni massima"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "L-ewwel trid tagħżel xi pakketti."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Hemm wisq pakketti magħżula"
 
 #: ../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"
@@ -1550,7 +1339,7 @@ msgstr ""
 "Żgur li trid tinstalla l-pakketti kollha magħżula?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1564,89 +1353,104 @@ msgstr ""
 "\n"
 "Trid tkompli?"
 
-#: ../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 "/_Fajl"
 
-#: ../rpmdrake:1155
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "Aġġorna sorsi"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "Irrisettja l-għażla"
 
-#: ../rpmdrake:1177
-#, fuzzy, c-format
+#: ../rpmdrake:1173
+#, fuzzy
 msgid "/Reload the _packages list"
 msgstr "Erġa' aqra l-lista ta' pakketti"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/O_ħroġ"
 
-#: ../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 "/Għaż_liet"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, fuzzy, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
+#, fuzzy
 msgid "/_Show automatically selected packages"
 msgstr "Uri l-pakketti magħżula awtomatikament"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Għajnuna"
 
-#: ../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 "Aġġornament 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 "Sib:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Fittex"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Ħassar"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installa"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Oħroġ"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Problema fatali"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Inqalgħet problema fatali: %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"
@@ -1658,13 +1462,12 @@ msgstr ""
 "\n"
 "Trid tkompli?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Sors ta' aġġornamenti diġà jeżisti"
 
-#: ../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 +1482,12 @@ msgstr ""
 "\n"
 "Imbgħad, erġa’ startja %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Kif tagħżel mera manwalment"
 
-#: ../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"
@@ -1699,58 +1501,56 @@ msgstr ""
 "\n"
 "Imbagħad, erġa' startja %s"
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Stenna ftit, qed insib pakketti disponibbli..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Stenna ftit, qed jinqara d-database tal-pakketti..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Qed jiġi nspezzjonat %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "bidliet:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Neħħi .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Uża .%s bħala fajl prinċipali"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Tagħmel xejn"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Installazzjoni lesta"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Spezzjona..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Il-pakketti kollha mitluba ġew installati."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problema waqt l-installazzjoni"
 
-#: ../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"
@@ -1760,18 +1560,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Ma nistax nikseb pakketti sors."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ma nistax nikseb il-pakkett tas-sors. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1784,38 +1583,34 @@ msgstr ""
 "Problema/i rappurtati:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Installazzjoni ta’ pakketti..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Qed ninizjalizza..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Installazzjoni ta’ pakketti..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Ibdel sors"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Jekk jogħġbok daħħal is-sors imsejjaħ \"%s\" fl-apparat [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Qed jitniżżel pakkett \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Qed jiġu verifikati l-firem tal-pakketti..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1829,13 +1624,12 @@ msgstr ""
 "\n"
 "Trid tkompli bl-installazzjoni?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Installazzjoni falliet"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1848,23 +1642,22 @@ msgstr ""
 "\n"
 "Jista' jkollok bżonn taġġorna d-database tas-sorsi."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Qed jiġi nstallat pakkett \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "ma nistax naċċessa l-fajl rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1876,43 +1669,33 @@ msgstr ""
 "Xi fajls ta' konfigurazzjoni inħolqu bħala \".rpmnew\" jew \".rpmsave\",\n"
 "issa tista' tinspezzjonahom sabiex tieħu azzjoni:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Dawn il-pakketti jkollhom informazzjoni dwar l-aġġornament"
 
-#: ../rpmdrake:1722
-#, fuzzy, c-format
+#: ../rpmdrake:1819
+#, fuzzy, perl-format
 msgid "More information on package... [%s]"
 msgstr "Iżjed tagħrif dwar il-pakkett..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Ebda pakkett ma nstab għall-installazzjoni."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Problema: ebda pakkett ma nstab għall-installazzjoni."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Stenna ftit, qed jinqara d-database tal-pakketti..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Stenna ftit, qed jitneħħew il-pakketti..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problema waqt it-tneħħija"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1922,8 +1705,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1935,8 +1717,8 @@ msgstr ""
 "Din l-għodda tgħinek tagħżel liema softwer trid tneħħi mill-kompjuter\n"
 "tiegħek."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1948,13 +1730,11 @@ msgstr ""
 "Din l-għodda tgħinek tagħżel aġġornamenti li trid tinstalla fuq il-\n"
 "kompjuter tiegħek."
 
-#: ../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 +1748,176 @@ msgstr ""
 "jew DVD. Din l-għodda tgħinek tagħżel liema softwer tixtieq tinstalla fuq\n"
 "il-kompjuter tiegħek."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Aġġornamenti ta' pakketti ta' softwer"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Aġġornament Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Aġġornamenti ta' pakketti ta' softwer"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Jekk jogħġbok daħħal l-indirizz tal-imejl hawn taħt"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Isem tal-user"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Tneħħija ta' pakketti ta' softwer"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Aġġornamenti ta' pakketti ta' softwer"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Installazzjoni ta’ pakketti ta’ softwer"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Le"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Iva"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Awstrija"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Awstralja"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belġju"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brażil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Svizzera"
 
-#: ../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 "Repubblika Ċeka"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Ġermanja"
 
-#: ../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 "Greċja"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spanja"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlandja"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Franza"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ungerija"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Iżrael"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italja"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Ġappun"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norveġja"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polonja"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugall"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Russja"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Svezja"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapor"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakkja"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Tajwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Renju Unit"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Ċina"
 
-#: ../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 "Stati Uniti"
 
-#: ../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"
@@ -2187,8 +1929,7 @@ msgstr ""
 "\n"
 "Nista' nkompli?"
 
-#: ../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"
@@ -2200,25 +1941,28 @@ msgstr ""
 "\n"
 "Nista' nkompli?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Stenna ftit, qed jitniżżlu indirizzi ta' mirja mill-website ta' Mandriva."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Stenna ftit, qed jitniżżlu indirizzi ta' mirja mill-website ta' 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 "Problema waqt it-tniżżil"
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2232,8 +1976,8 @@ msgstr ""
 "In-network, jew il-website ta' Mandriva, tista' ma tkunx \n"
 "disponibbli. Erġa' pprova iżjed tard."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2247,18 +1991,15 @@ msgstr ""
 "In-network, jew il-website ta' Mandriva, tista' ma tkunx \n"
 "disponibbli. Erġa' pprova iżjed tard."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Ebda mera"
 
-#: ../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"
@@ -2272,69 +2013,64 @@ msgstr ""
 "komuni huwa meta l-arkitettura tas-CPU tiegħek mhux sapportit\n"
 "mill-aġġornamenti uffiċjali tal-Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Jekk jogħġbok agħżel mera li tixtieq."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Qed jiġi kkupjat fajl għas-sors \"%s\"..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Qed jiġi eżaminat fajl tas-sors \"%s\"..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Qed jiġi eżaminat fajl remot tas-sors \"%s\"..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " lest."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr "falla!"
 
 #. -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 mis-sors %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Qed jitniżżel \"%s\"..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Tniżżil ta' \"%s\", ħin li fadal: %s, veloċitàL %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Tniżżil ta’ \"%s\", veloċità: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Stenna ftit, qed jiġu aġġornati l-medji..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Problema biex jinkisbu l-pakketti"
 
-#: ../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 +2084,30 @@ msgstr ""
 "dan il-każ tista' tuża l-Immaniġġjar ta' Sorsi biex tneħħih u terġa'\n"
 "żżidu, inkella bħalissa ma jistax jintleħaq u tista' tipprova iżjed tard."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Aġġorna sorsi"
 
-#: ../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 "Agħżel is-sorsi li trid taġġorna:"
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr "Magħżul"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Aġġorna"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2387,8 +2119,8 @@ msgstr ""
 "Problemi:\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 +2130,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Ma nistax noħloq medju."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Problema waqt iż-żieda ta' sors"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2419,8 +2149,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"
@@ -2430,8 +2160,8 @@ msgstr ""
 "Mandriva Linux li qed tuża (%s).\n"
 "Se jintefa."
 
-#: ../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"
@@ -2441,13 +2171,11 @@ msgstr ""
 "Mandriva Linux li qed tuża (%s).\n"
 "Se jintefa."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Għajnuna attwata"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2723,6 +2451,18 @@ msgstr "Neħħi softwer"
 msgid "Software Media Manager"
 msgstr "Maniġġjar ta' sorsi tas-softwer"
 
+#~ msgid "Stop"
+#~ msgstr "Ieqaf"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Pakketti kollha, skond ir-repożitorju tas-sors"
+
+#~ msgid "Normal information"
+#~ msgstr "Informazzjoni normali"
+
+#~ msgid "Maximum information"
+#~ msgstr "Informazzjoni massima"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "Kollox ġie nstallat sew"
 
diff --git a/po/nb.po b/po/nb.po
index 0616e022..0f4ffdcc 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\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-07-07 02:10+0200\n"
 "Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
 "Language-Team: Norsk Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -23,13 +24,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Velg 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"
@@ -53,18 +52,16 @@ msgstr ""
 "deler\n"
 "men må gjøre dette i to steg.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Distribusjonskilder"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Offisielle oppdateringer"
 
-#: ../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,85 @@ msgstr ""
 "\n"
 "Er det greit å fortsette?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Legger til media..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Legg til et medium"
 
-#: ../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-tjener"
 
-#: ../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-tjener"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP-tjener"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Fjernbar enhet"
-
-#: ../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 "Fjernbar enhet"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Bla igjennom..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: ../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 "Passord:"
 
-#: ../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/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 etterlatt tom, syntese/hdlist vil bli automatisk sjekket"
 
-#: ../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 "Lag media for hele distribusjonen"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Søk igjennom dette media for oppdateringer"
 
-#: ../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 må minst fylle opp de to første oppføringene."
 
-#: ../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 +165,11 @@ msgstr ""
 "Det er allerede et medium med det navnet, vil du\n"
 "virkelig bytte det ut?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Legger til et medium:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Mediumstype:"
 
@@ -201,10 +177,9 @@ msgstr "Mediumstype:"
 #: ../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 "Avbryt"
 
@@ -213,101 +188,86 @@ msgstr "Avbryt"
 #: ../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 valg for pakkeinstallasjon"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "alltid"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "aldri"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Kontroller RPMer som skal installeres:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Program som skal brukes til nedlasting:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Fjerning av kilder"
 
 #: ../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 "Fjerner medium..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Rediger et medium"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Redigerer medium \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Lagre endringer"
 
-#: ../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 "Mellomtjener..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Du må sette inn mediumet for å fortsette"
 
 #: ../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 å kunne lagre endringene må du sette inn et medium i stasjonen."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Sett opp mellomtjenere"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Mellomtjeneroppsett for media \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globalt mellomtjeneroppsett"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -316,169 +276,140 @@ msgstr ""
 "<mellomtjener-vert[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Mellomtjener-vertsnavn:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Du kan spesifisere en /bruker/passord for mellomtjener "
 "identitetsbekreftelsen:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Bruker:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Legg til en parallell-gruppe"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Rediger en parallell-gruppe"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Legg til en mediumgrense"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Velg et medium for å legge til i mediagrensa:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Legg til en vert"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 "Skriv inn vertsnavnet eller IP-adressen til verten som skal legges til:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Rediger parallell-gruppe \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Mediagrense:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Legg til"
 
 #: ../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 "Verter:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Sett opp parallell-urpmi (distribuert kjøring av 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 "Mediagrense"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokoll"
+
 #: ../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 "Rediger..."
 
-#: ../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 "Legg til..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Håndter nøkler for digitale signaturer av 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 "Medium"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Nøkler"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "inget navn funnet, nøkkel eksisterer ikke i rpm-nøkkelringen!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Legg til en nøkkel"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Velg en nøkkel for å legge til mediumet %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Fjern en nøkkel"
 
 #: ../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)"
@@ -487,37 +418,31 @@ msgstr ""
 "(navn på nøkkelen: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Legg til en nøkkel..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Fjern nøkkel"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Sett opp mediet"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Aktivert?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Oppdateringer?"
 
-#: ../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"
@@ -527,38 +452,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Legg til selvvalgt..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Oppdater..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Håndter nøkler..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parallell..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Globale innstillinger..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../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"
@@ -568,8 +487,7 @@ msgstr ""
 "\n"
 "Er det greit å fortsette?"
 
-#: ../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 ""
 "på maskinen din. Du vil da få tilgang til nye programvarepakker\n"
 "eller å utføre oppdateringer."
 
-#: ../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 ""
 "på et annet skrivebord, eller driver du å installerer pakker\n"
 "samtidig?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Klarte ikke å legge til medium, feil 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 holder på å legge til et nytt pakkemedium, «%s».\n"
+"Det betyr at du vil være i stand til å legge til programvarepakker\n"
+"til ditt system fra det nye mediet."
+
+#: ../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,63 +540,60 @@ msgstr ""
 "Det betyr at du vil være i stand til å legge til programvarepakker\n"
 "til ditt system fra det nye mediet."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Medium «%s» vellykket lagt til."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Medium «%s» vellykket lagt til."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Bruk: %s [OPSJONER]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 "  --changelog-first      vis changelog før filliste i beskrivelsesvinduet"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     begrense til gitte media"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     foreslå å sammenslå alle .rpmnew/.rpmsave-filer "
 "funnet"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            sett modus (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      ikke spørr etter første bekreftelsesspørsmål i "
 "oppdateringsmodus"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      ikke oppdater media under oppstart"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        ikke kontroller pakkesignaturer"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -677,33 +601,27 @@ msgstr ""
 "  --parallel=alias,vert  i parallell-modus, bruker \"alias\"-gruppe, bruker "
 "\"vert\"-maskin for å vise nødvendige avhengigheter"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    vis bare disse pakkene"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      forhåndsvelg disse pakkene"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 tving til å kjøre som root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pakke         kjør søk etter \"pakke\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Kjører i brukermodus"
 
-#: ../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"
@@ -713,634 +631,517 @@ msgstr ""
 "Du vil ikke kunne gjøre noen endringer på systemet,\n"
 "men du kan fortsatt se igjennom den eksisterende databasen."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Tilgjengelighet"
 
-#: ../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 "Sikkerhetskopi"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD-brenning"
 
-#: ../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 "Andre"
 
-#: ../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øker"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Databøker"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Ofte stilte spørsmål (Faqs)"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Bruksanvisninger (howto)"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Litteratur"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Klynge (Cluster)"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Meldingsvideresending"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Kø-tjenester"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Kommunikasjon"
 
-#: ../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 "Utvikling"
-
-#: ../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 "Utvikling"
+
+#: ../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 "Kjerne"
 
-#: ../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 "Tekstprogrammer"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Undervisning"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatorer"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Filverktøy"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Spill"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Eventyr"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Spill"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Brett"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kort"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puslespill"
 
-#: ../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-basert"
 
-#: ../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 "Grafikk"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Overvåking"
 
-#: ../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 "Nettverk"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Prat"
 
-#: ../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 "Nettverk"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Filoverføring"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Lynmelding"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Epost"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Nyheter"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Fjerntilgang"
 
-#: ../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økler"
 
-#: ../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 "Vitenskap"
-
-#: ../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 "Vitenskap"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kjemi"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Datavitenskap"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geovitenskap"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematikk"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fysikk"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Skall"
 
-#: ../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 "Basis"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Oppsett"
+#: ../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 "Oppstart og init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Oppsett"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakking"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Utskrift"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Utrulling"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Utrulling"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Skrifttyper"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsoll"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Skrifttyper"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "Sanntype"
 
-#: ../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 "Internasjonalisering"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kjerne og maskinvare"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Biblioteker"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Tjenere"
 
-#: ../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 "Tekstverktøy"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Leketøy"
 
-#: ../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 "(Ikke tilgjengelig)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Søkeresultater"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Søkeresultater (ingen)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Søker..."
 
-#: ../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 "Kan legges til"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Oppgraderbar"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Kan legges til"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Ikke valgt"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Valgte"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Ikke valgt"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Viktighet: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Grunn til oppdatering: "
+
+#. 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 "Endringslogg:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Medium: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Nåværende installerte versjon: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versjon: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arkiktektur: "
 
-#: ../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 "Viktighet: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Størrelse: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Oppsummering: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Grunn til oppdatering: "
-
-#: ../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 "Mer informasjon om pakke..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Velg"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "En av de følgende pakkene behøves:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Velg"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Lister opp pakker..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Ingen oppdatering"
 
-#: ../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 ""
 "noen tilgjengelige oppdateringer for pakkene som er installert på\n"
 "din maskin, eller at du allerede har installert alle sammen."
 
-#: ../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 "Mer info"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informasjon om pakker"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Noen ytterligere pakker renger å fjernes"
 
-#: ../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 ""
 "å bli fjernet:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Noen pakker kan ikke fjernes"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1396,8 +1190,7 @@ msgstr ""
 "Beklager, men fjerning av disse pakkene vil ødelegge systemet ditt:\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 ""
 "vekk nå:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Ytterligere pakker trengs"
 
-#: ../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 ""
 "installeres:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (hører til skip-lista)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Noen pakker kan ikke installeres"
 
-#: ../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 "Noen pakker må fjernes"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valgt: %d MB / Ledig diskplass: %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 er ikke tilgjengelig for denne pakken\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Sikkerhetsoppdateringer"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Feilrettingsoppdateringer"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Installer"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normale oppdateringer"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Installer"
 
-#: ../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, etter gruppe"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Alle pakker, ved oppdateringstilgjengelighet"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Alle pakker, etter størrelse"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Alle pakker, etter valgstadie"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Alle pakker, etter mediumlager"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Alle pakker, ved oppdateringstilgjengelighet"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Bare blader, sortert etter installasjonsdato"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Alle pakker, etter gruppe"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normale oppdateringer"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Feilrettingsoppdateringer"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normale oppdateringer"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Sikkerhetsoppdateringer"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "i navn"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "i beskrivelser"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "i filnavn"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normal informasjon"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Full informasjon"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Du må velge noen 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"
@@ -1577,7 +1352,7 @@ msgstr ""
 "Ønsker du virkelig å installere alle valgte pakker?"
 
 #: ../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"
 "Er det ok å fortsette?"
 
-#: ../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 "/_Fil"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Oppdater media"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Nullstill valget"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Last _pakkelisten på nytt"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Avslutt"
 
-#: ../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 "/_Valg"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Vis valgte pakker automatisk"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../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 Oppdatering"
+
+#. -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 "Finn:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Søk"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Nullstill"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installer"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Kritisk feil"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "En kritisk feil oppsto: %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"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Allerede eksisterende oppdateringsmedia"
 
-#: ../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"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Hvordan velge ditt speil manuelt"
 
-#: ../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"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Finner tilgjengelige pakker..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Leser pakkedatabase..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Sjekker %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "endringer:"
 
-#: ../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 "Bruk .%s som hovedfil"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Installasjon ferdig"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Sjekk..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Alle forespurte pakker ble vellykket installert."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problemer under installasjon"
 
-#: ../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 "Ikke i stand til å få tak i kildepakker."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ikke i stand til å hente kildepakker, beklager. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1811,38 +1592,34 @@ msgstr ""
 "Feil rapportert:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Pakkeinstallasjon..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Klargjør..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Pakkeinstallasjon..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Endre medium"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sett inn medium kalt \"%s\" på enhet [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laster ned pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Sjekker pakkersignaturer..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1856,13 +1633,12 @@ msgstr ""
 "\n"
 "Vil du fortsette installasjon?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Installasjon mislyktes"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1874,23 +1650,22 @@ msgstr ""
 "\n"
 "Du vil kanskje oppdatere din mediadatabase."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Forbereder pakker for installasjon..."
 
-#: ../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 "klarte ikke å åpne rpm-fil [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1902,43 +1677,33 @@ msgstr ""
 "Noen oppsettsfiler ble opprettet som `.rpmnew' ellr `.rpmsave',\n"
 "du kan nå sjekke noen for å utføre noen handlinger:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Disse pakkene kommer med oppgraderingsinformasjon"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Mer informasjon om pakke... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Ingen pakker ble funnet for installasjon."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Uopprettelig feil: ingen pakke ble funnet for installasjon, beklager."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Leser pakkedatabase..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Fjerner pakker..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problem under fjerning"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1948,8 +1713,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1961,8 +1725,8 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge hvilken programvare du skal fjerne\n"
 "fra maskinen din."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1974,13 +1738,11 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
 "på maskinen din."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Velkommen til installasjonsprogrammet for programvarepakker!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1994,214 +1756,172 @@ msgstr ""
 "på CDROM eller DVD. Dette verktøyet hjelper deg å velge hvilken\n"
 "programvare du ønsker å installere på maskinen din."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Programvareoppdatering"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Oppdatering"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Programvareoppdatering"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Skriv inn dine referanser for å få tilgang til mellomtjener\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Brukernavn:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Fjerning av Programvarepakker"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Oppdatering av Programvarepakker"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Installasjon av Programvarepakker"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nei"
 
-#: ../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 "Østerrike"
 
-#: ../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 "Brasil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: ../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 "Tjekkiske Republikk"
 
-#: ../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 "Hellas"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spania"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Frankrike"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hungarn"
 
-#: ../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 "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 "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 "Russland"
 
-#: ../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 "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 "Storbritannia"
 
-#: ../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 "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"
@@ -2213,8 +1933,7 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../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"
@@ -2226,23 +1945,26 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../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 "Laster ned speiladresser, vennligst vent."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Laster ned liste over speil fra Mandriva-nettsiden, vennligst vent."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Feil under nedlasting"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2256,8 +1978,8 @@ msgstr ""
 "Nettverket, eller nettsiden, er kanskje ikke tilgjengelig.\n"
 "Prøv igjen senere."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2271,18 +1993,15 @@ msgstr ""
 "Nettverket, eller Mandriva-nettsiden, er kanskje ikke tilgjengelig.\n"
 "Prøv igjen senere."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Inget speil"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Jeg kan ikke finne noe passende speil."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2296,69 +2015,64 @@ msgstr ""
 "når arkitekturen til prosessoren din ikke er støttet\n"
 "av Mandriva Linux' offisielle oppdateringer."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Velg ønsket speil."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierer fil for medium `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Kontrollerer fil fra medium `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Kontrollerer ekstern fil fra medium `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " ferdig."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " mislyktes!"
 
 #. -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 medium %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Starter nedlastning av `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Nedlastning av `%s', tid som gjenstår:%s, hastighet:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Nedlastning av `%s', hastighet:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Oppdaterer media..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Feil ved henting av 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"
@@ -2375,34 +2089,29 @@ msgstr ""
 "rekke det\n"
 "og du bør da prøve på nytt senere."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Oppdaterer 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 "Velg mediet du ønsker å oppdatere:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Velg alle"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2414,8 +2123,8 @@ msgstr ""
 "Feil:\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"
@@ -2425,18 +2134,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Kan ikke opprette medium."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Feil under forsøk på å legge til medium"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2446,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"
@@ -2457,8 +2164,8 @@ msgstr ""
 "versjonen av %s du kjører (%s).\n"
 "Det vil bli deaktivert"
 
-#: ../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"
@@ -2468,13 +2175,11 @@ msgstr ""
 "versjonen av Mandriva Linux du kjører (%s).\n"
 "Det vil bli deaktivert"
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Hjelp startet opp i bakgrunn"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2750,6 +2455,18 @@ msgstr "Fjern programvare"
 msgid "Software Media Manager"
 msgstr "Programvare-Mediahåndterer"
 
+#~ msgid "Stop"
+#~ msgstr "Stopp"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Alle pakker, etter mediumlager"
+
+#~ msgid "Normal information"
+#~ msgstr "Normal informasjon"
+
+#~ msgid "Maximum information"
+#~ msgstr "Full informasjon"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "alt ble riktig installert"
 
diff --git a/po/nl.po b/po/nl.po
index c55e7468..9d2121a4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-nl\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 19:09+0200\n"
 "Last-Translator: Rob Teng <mandrake.tips@free.fr>\n"
 "Language-Team: Nederlands\n"
@@ -23,13 +24,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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 "Kies mediatype"
 
-#: ../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 ""
 "van uw distributie omvatten. (U kunt beide toevoegen, dit dient in 2 stappen "
 "te gebeuren.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Distributie bronnen"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Officiële herzieningen"
 
-#: ../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,107 +80,88 @@ msgstr ""
 "\n"
 "Is het in orde om door te gaan?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Even geduld, bezig met toevoegen van media..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Medium toevoegen"
 
 #  Local media
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokale bestanden"
 
-#: ../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 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 "Verwisselbaar apparaat"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Pad of koppelpunt:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Verwisselbaar apparaat"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Bladeren..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Aanmeldnaam:"
 
-#: ../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 "Wachtwoord:"
 
 #  The hdlist
-#: ../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 "Relatief pad naar synthesis of hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 "Wanneer u niets invult, wordt de synthese/hdlist automatisch opgevraagd"
 
-#: ../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 "Maak media voor een volledige distributie"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Doorzoek deze media op herzieningen:"
 
-#: ../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 dient tenminste de eerste twee velden in te vullen."
 
-#: ../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?"
@@ -191,13 +169,11 @@ msgstr ""
 "Er bestaat reeds een medium met die naam, weet u\n"
 "zeker dat u deze wilt vervangen?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Bezig met toevoegen van medium:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Mediumtype:"
 
@@ -205,10 +181,9 @@ msgstr "Mediumtype:"
 #: ../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 "Annuleren"
 
@@ -217,80 +192,68 @@ msgstr "Annuleren"
 #: ../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 installingen voor de pakketinstallatie..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "altijd"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nooit"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifieer de te installeren RPM's "
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Te gebruiken download programma:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Bron verwijderen"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Weet u zeker dat u bron \"%s\" wilt verwijderen?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Even geduld, bezig met verwijderen van medium..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Een medium bewerken"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Bewerken van medium \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: ../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 "U dient het medium te plaatsen om door te 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 ""
@@ -298,22 +261,19 @@ msgstr ""
 "plaatsen."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Proxy's configureren"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxy-instellingen voor media \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globale proxy-instellingen"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -322,73 +282,60 @@ msgstr ""
 "poort (syntax: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy-hostnaam:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "U kunt een gebruikersnaam/wachtwoord aangeven voor de proxy-aanmelding:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Gebruiker:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Parallelle groep toevoegen"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Parallelle groep bewerken"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Medium limiet toevoegen"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Kies een medium om toe te voegen in de media limiet:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Een host toevoegen"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Type de hostnaam of IP adres in van de toe te voegen host:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Bewerken van parallelle groep \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Groepsnaam:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Medialimiet:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -398,69 +345,56 @@ msgstr "Toevoegen"
 #  it in the sense of taking out the media is definately wrong!
 #  -Reinout
 #: ../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 "Verwijderen"
 
 #: ../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 "parallel urpmi configureren (gespreide uitvoering van urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Groep"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Media limiet"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Opdracht"
 
-#: ../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 "Bewerken..."
 
-#: ../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 "Toevoegen..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Beheer sleutels voor digitale ondertekening van pakketten"
 
-#: ../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"
@@ -469,27 +403,24 @@ msgstr ""
 "Sleutels"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "Geen naam gevonden, de sleutel is niet aanwezig aan de rpm sleutelbos"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Een sleutel toevoegen"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Kies een sleutel voor het medium %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Verwijder een 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)"
@@ -498,38 +429,32 @@ msgstr ""
 "(naam van de sleutel: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Een sleutel toevoegen..."
 
 #  Removable media
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Sleutel verwijderen"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Media configureren"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Ingeschakeld?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Herzieningen?"
 
-#: ../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"
@@ -539,38 +464,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Op maat toevoegen..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Verversen..."
 
-#: ../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 "Globale opties..."
 
-#: ../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"
@@ -580,8 +499,7 @@ msgstr ""
 "\n"
 "Wilt u doorgaan?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -595,8 +513,7 @@ msgstr ""
 "op uw computer in te stellen. Dezen zullen dan beschikbaar zijn om nieuwe\n"
 "softwarepakketten te installeren of om bijgewerkte paketten te leveren."
 
-#: ../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"
@@ -608,13 +525,23 @@ msgstr ""
 "al op een ander werkblad, of bent u op het moment al \n"
 "pakketten aan het installeren?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Medium kan niet toegevoegd worden, foutieve of ontbrekende argumenten"
 
-#: ../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 ""
+"U staat op het punt een nieuw pakketmedium, `%s'.\n"
+"Dit houdt in dat u in staat zult zijn nieuwe softwarepakketten\n"
+"van dat nieuwe medium aan uw systeem toe te voegen."
+
+#: ../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"
@@ -624,18 +551,22 @@ msgstr ""
 "Dit houdt in dat u in staat zult zijn nieuwe softwarepakketten\n"
 "van dat nieuwe medium aan uw systeem toe te voegen."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Het medium `%s' is met succes toegevoegd."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Het medium `%s' is met succes toegevoegd."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Gebruik: %s [OPTIE]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -643,45 +574,38 @@ msgstr ""
 "  --changelog-first      de wijzigingenlijst voor de bestandenlijst opvoeren "
 "in het beschrijvingsvenster"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     beperken tot gegeven media"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     voorstellen om alle gevonden .rpmnew/.rpmsave "
 "bestanden samen te voegen"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            kies modus (installeren (standaard), verwijderen, "
 "verversen)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      niet om bevestiging vragen in verversingsmodus"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      geen media bijwerken bij het starten"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr " --no-verify-rpm        controleer de pakket-handtekening niet"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -689,33 +613,27 @@ msgstr ""
 "  --parallel=alias,host  gebruik parallel-modus, gebruik group \"alias\", "
 "gebruik machine \"host\" om de benodigde afhankelijkheden te tonen"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    toon alleen deze pakketten"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      maak een voorselectie van deze pakketten"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr " --root                 dwing als root uit te voeren"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           voer zoekopdracht uit voor \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Geactiveerd in gebruikersmodus"
 
-#: ../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"
@@ -725,635 +643,518 @@ msgstr ""
 "U kunt geen veranderingen in het systeem aanbrengen,\n"
 "maar wel de lijst van pakketten doorbladeren."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Toegankelijkheid"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archiveren"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Reservekopie"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD-branden"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compressie"
 
-#: ../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 "Overige"
 
-#: ../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 "Boeken"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Computerboeken"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Veel gestelde vragen"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatuur"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Berichten doorgeven"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Queueing-diensten"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Communicatie"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Databases"
 
-#: ../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 "Editors"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Onderricht"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulators"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Bestandsgereedschappen"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Spelletjes"
-
-#: ../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 "Spelletjes"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Bordspellen"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kaarten"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzzels"
 
-#: ../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 werkomgeving"
-
-#: ../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 "Grafische werkomgeving"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Gebaseerd op 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 "Grafisch"
 
 # Nieuwe vertaling 'toezicht houden' okee?
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Observatie"
 
-#: ../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 "Netwerktoepassingen"
-
-#: ../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 "Netwerktoepassingen"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Bestandsoverdracht"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Directe berichten"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "E-mail"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Nieuws"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Toegang op afstand"
 
-#: ../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 "Publieke sleutels"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publiceren"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Wetenschap"
-
-#: ../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 "Wetenschap"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Scheikunde"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informatica"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Aardwetenschappen"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Wiskunde"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Natuurkunde"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../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 "Systeem"
-
-#: ../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 "Configuratie"
+#: ../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 "Systeem"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Opstarten en initialisatie"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configuratie"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Apparatuur"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakketbeheer"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Afdrukken"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Uitrol"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Uitrol"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Lettertypen"
-
-#: ../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 "Lettertypen"
+
+#: ../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 "Internationalisatie"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel en apparatuur"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Bibliotheken"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servers"
 
-#: ../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 "Tekstgereedschappen"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Speeltjes"
 
-#: ../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 "(Niet beschikbaar)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Zoekresultaten"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Zoekresultaat (niets)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Even geduld, bezig met zoeken..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stoppen"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Toevoegbaar"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Opwaardeerbaar"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Toevoegbaar"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Niet geselecteerd"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Geselecteerd"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Niet geselecteerd"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Belang: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Reden voor bijwerken: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Geen omschrijving"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Bestanden:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Veranderingen-logboek:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Medium: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Momenteel geïnstalleerde versie: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versie: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Architectuur: "
 
-#: ../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 "Belang: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Grootte: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Samenvatting: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Reden voor bijwerken: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Beschrijving: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Geen omschrijving"
+#. 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 informatie over pakket..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Maak een keuze"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Eén van de volgende pakketten is benodigd:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Maak een keuze"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Even geduld, bezig met opsommen van pakketten..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Geen herziening"
 
-#: ../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"
@@ -1364,29 +1165,24 @@ msgstr ""
 "geïnstalleerde pakketten, ofwel dat u ze reeds allemaal\n"
 "geïnstalleerd heeft."
 
-#: ../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 "Meer informatie"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informatie over pakketten"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Enkele extra pakketten dienen verwijderd te worden"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1396,13 +1192,11 @@ msgstr ""
 "verwijderd worden:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Sommige pakketten kunnen niet worden verwijderd"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1411,8 +1205,7 @@ msgstr ""
 "beschadigen:\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 +1214,11 @@ msgstr ""
 "Vanwege hun afhankelijkheden dienen de volgende pakket(ten)\n"
 "nu gedeselecteerd te worden:\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Extra pakketten benodigd"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1437,18 +1228,17 @@ msgstr ""
 "pakket(ten) ook geïnstalleerd te worden:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (staat op de overslaan-lijst)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Sommige pakketten kunnen niet worden geïnstalleerd"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1458,124 +1248,109 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Enkele pakketten dienen verwijderd te worden"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Geselecteerd: %d MB / Vrije schijfruimte: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Geselecteerde grootte: %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 "Omschrijving niet aanwezig voor dit pakket\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Beveiligingsverbeteringen"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Programmafout-reparaties"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Installeren"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Gewone bijgewerkte pakketten"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Installeren"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s keuzes"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux keuzes"
 
-#: ../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 pakketten, alfabetisch"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Alle pakketten, op groep"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Alle pakketten, op basis van beschikbaarheid van herzieningen"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Alle pakketten, op grootte"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Alle pakketten, op selectiestatus"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Alle pakketten, op medium-opslagplaats"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Alle pakketten, op basis van beschikbaarheid van herzieningen"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Alleen blaadjes, gesorteerd op installatie datum"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Alle pakketten, op groep"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Gewone bijgewerkte pakketten"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Programmafout-reparaties"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Gewone bijgewerkte pakketten"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Beveiligingsverbeteringen"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "in namen"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "in omschrijvingen"
 
 #  Local media
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "in bestandsnamen"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normale informatie"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maximale informatie"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "U dient eerst pakketten te selecteren."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Er zijn te veel pakketten geselecteerd"
 
 #: ../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 +1367,7 @@ msgstr ""
 "Weet u zeker dat u alle geselecteerde pakketten wilt installeren?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1607,89 +1382,100 @@ msgstr ""
 "\n"
 "Is het goed om hiermee door te 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 "/_Bestand"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Media verversen"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/Alle _selecties opheffen"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Pakkettenlijst herladen"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/A_fsluiten"
 
-#: ../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 "/_Opties"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Automatisch geselecteerde pakketten tonen"
 
-#: ../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
+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 Vernieuwen"
+
+#. -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 "Zoeken:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Wissen"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installeren"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Fatale fout"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Er is een fatale fout opgetreden: %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 +1488,12 @@ msgstr ""
 "\n"
 "Is het goed om door te gaan?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Reeds bestaand vernieuwingsmedium"
 
-#: ../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 +1509,12 @@ msgstr ""
 "\n"
 "Daarna herstart u %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Hoe u handmatig uw mirror kunt kiezen"
 
-#: ../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,59 +1528,57 @@ msgstr ""
 "\n"
 "Herstart daarna %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Even geduld, bezig met opzoeken van beschikbare pakketten..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Even geduld, bezig met lezen van pakkettendatabase..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Inspecteren van %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "veranderingen:"
 
 #  Removable media
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr ".%s verwijderen"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr ".%s als hoofdbestand gebruiken"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Niets doen"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Installatie voltooid"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Inspecteren..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Alle gevraagde pakketten zijn succesvol geïnstalleerd."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Probleem tijdens de installatie"
 
-#: ../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"
@@ -1806,18 +1588,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Niet in staat bronpakketten op te halen"
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Kon het bron-pakket niet ophalen, sorry. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1829,38 +1610,34 @@ msgstr ""
 "Gerapporteerde fout(en):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Pakketinstallatie..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Initialiseren..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Pakketinstallatie..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Medium veranderen"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Voer het medium in met de naam \"%s\" in apparaat [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Ophalen pakket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Controleren van pakket-ondertekeningen..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1874,13 +1651,12 @@ msgstr ""
 "\n"
 "Is het goed om door te gaan?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Installatie mislukt"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1892,23 +1668,22 @@ msgstr ""
 "\n"
 "U wilt misschien uw media-database verversen."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Voorbereiden van pakketinstallatie..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installeren pakket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "geen toegang tot RPM-bestand [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1920,43 +1695,33 @@ msgstr ""
 "Sommige configuratiebestanden zijn gecreëerd als `.rpmnew' of `.rpmsave',\n"
 "u kunt er nu enkele inspecteren en zonodig actie te ondernemen:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Deze pakketten bevatten opwaardeerinformatie"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Meer informatie over pakket... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Geen pakket gevonden voor installatie."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Onoplosbaar probleem: geen pakket gevonden voor installatie, sorry."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Even geduld, bezig met lezen van pakkettendatabase..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Even geduld, bezig met het verwijderen van pakketten..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Probleem tijdens het verwijderen"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1966,8 +1731,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1979,8 +1743,8 @@ msgstr ""
 "Dit hulpprogramma helpt u bij het kiezen welke software u van uw\n"
 "computer wilt verwijderen."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1992,13 +1756,11 @@ msgstr ""
 "Dit programma helpt u bij het kiezen van de bijgewerkte pakketten die u op\n"
 "uw computer wilt installeren."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Welkom bij het software-installatieprogramma!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -2012,218 +1774,176 @@ msgstr ""
 "softwarepakketten op CD-ROM of DVD. Dit hulpprogramma helpt u\n"
 "met kiezen welke software u op uw computer wilt installeren."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Softwarepakketten-opwaardering"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Vernieuwen"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Softwarepakketten-opwaardering"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Voer uw aanmeldgegevens in voor toegang tot de proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Gebruikersnaam:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Softwarepakketten verwijderen"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Softwarepakketten-opwaardering"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Softwarepakketten-installatie"
 
-#: ../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 "Info..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Oostenrijk"
 
-#: ../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 "Brazilië"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Zwitserland"
 
-#: ../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 "Tsjechië"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Duitsland"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Denemarken"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Griekenland"
 
-#: ../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 "Frankrijk"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hongarije"
 
 #  Use plural for "installed" if your language
 #  * distinguish plural and singular here
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israël"
 
 #  Use plural for "installed" if your language
 #  * distinguish plural and singular here
-#: ../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 "Noorwegen"
 
-#: ../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 "Zweden"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slowakije"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Verenigd Koninkrijk"
 
-#: ../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 Staten"
 
-#: ../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 +1955,7 @@ msgstr ""
 "\n"
 "Wilt u verder gaan?"
 
-#: ../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"
@@ -2248,25 +1967,28 @@ msgstr ""
 "\n"
 "Wilt u verder gaan?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s keuzes"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Even geduld, bezig met downloaden van mirror-adressen."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Even geduld aub, bezig met downloaden van mirror-adressen van de Mandriva "
 "webstek."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Fout tijdens ophalen"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2280,8 +2002,8 @@ msgstr ""
 "Het netwerk, of de Mandriva-website, zijn wellicht onbereikbaar.\n"
 "Probeert u het aub later opnieuw."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2295,18 +2017,15 @@ msgstr ""
 "Het netwerk, of de Mandriva-website, zijn wellicht onbereikbaar.\n"
 "Probeert u het later opnieuw."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Geen mirror"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Niet in staat om een geschikte mirror te vinden."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2320,70 +2039,65 @@ msgstr ""
 "is het geval waarin de architectuur van uw processor niet ondersteund\n"
 "wordt door de officiële Mandriva Linux mirrors."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Kies de gewenste mirror."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiëren van bestand voor medium `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Onderzoeken bestand van medium `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Onderzoeken van bestand op afstand van medium `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " klaar."
 
 #  Local media
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " mislukt!"
 
 #. -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 van medium %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Starten met ophalen van `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Downloaden van `%s', tijd over:%s, snelheid:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Downloaden van `%s', snelheid:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Even geduld, bezig met verversen van media..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Fout bij het ophalen van de pakketten"
 
-#: ../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"
@@ -2401,34 +2115,29 @@ msgstr ""
 "het \n"
 "op een later tijdstip opnieuw proberen."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Media verversen"
 
-#: ../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 "Selecteer de media die u wilt verversen:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Selecteer alles"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Verversen"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2440,8 +2149,8 @@ msgstr ""
 "Foutmeldingen:\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"
@@ -2451,18 +2160,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Niet in staat medium aan te maken"
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Toevoegen medium mislukt"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2472,8 +2179,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"
@@ -2483,8 +2190,8 @@ msgstr ""
 "u gebruikt (%s).\n"
 "Het zal worden gedeactiveerd."
 
-#: ../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"
@@ -2494,13 +2201,11 @@ msgstr ""
 "Mandriva Linux die u gebruikt (%s).\n"
 "Het zal worden gedeactiveerd."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Hulpfunctie gestart op achtergrond"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "Even geduld, het hulpvenster zal zometeen op uw werkblad verschijnen."
@@ -2775,6 +2480,18 @@ msgstr "Software verwijderen"
 msgid "Software Media Manager"
 msgstr "Software Mediabeheer"
 
+#~ msgid "Stop"
+#~ msgstr "Stoppen"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Alle pakketten, op medium-opslagplaats"
+
+#~ msgid "Normal information"
+#~ msgstr "Normale informatie"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maximale informatie"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "Alles is correct geïnstalleerd"
 
diff --git a/po/nn.po b/po/nn.po
index 2a1c8c93..c208e3fd 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\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-01-10 19:17+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -17,13 +18,11 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\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 "Vel 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"
@@ -47,18 +46,16 @@ msgstr ""
 "opp-\n"
 "dateringar. (Du kan leggja til begge, men då i to steg.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Distribusjonskjelder"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Offisielle oppdateringar"
 
-#: ../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"
 "Vil du halda fram?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Legg til medium. Vent litt ..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Legg til medium"
 
-#: ../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 "Stig:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP-tenar"
 
-#: ../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 "URI:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "RSYNC-tenar"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP-tenar"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Flyttbar eining"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Stig eller monteringspunkt:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Flyttbar eining"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Bla gjennom ..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Brukarnamn:"
 
-#: ../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 "Passord:"
 
-#: ../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 stig til syntese-/hd-liste:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Viss tom vert det automatisk leita etter synthesis- eller hdlist-fila"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Namn:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Lag medium for ein heil distribusjon"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Søk gjennom dette mediet etter oppdateringar"
 
-#: ../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 må minst fylla ut dei to første oppføringane."
 
-#: ../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 ""
 "Det finst allereie eit medium med dette namnet. Er du sikker på at du vil "
 "byta det ut?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Legg til medium:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Medietype:"
 
@@ -196,10 +171,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 "Avbryt"
 
@@ -208,101 +182,86 @@ msgstr "Avbryt"
 #: ../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 val for pakkeinstallering"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "alltid"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "aldri"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Stadfest RPM-ar som skal installerast:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Last ned program å bruka:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Kjeldefjerning"
 
 #: ../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 fjerna kjelda «%s»?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Fjernar medium. Vent litt ..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Rediger medium"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Redigerer mediet «%s»:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Lagra endringar"
 
-#: ../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 "Mellomtenar ..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Du må setja inn mediet før du kan halda fram"
 
 #: ../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 å kunna lagra endringane må setja mediet i stasjonen."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Set opp mellomtenarar"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Mellomtenaroppsett for mediet «%s»"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globalt mellomtenaroppsett"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -311,166 +270,137 @@ msgstr ""
 "portnummer (syntaks: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Vertsnamn:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Du kan  g skriva inn brukarnamn og passord for mellomtenaren:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Brukarnamn:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Legg til parallellgruppe"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Rediger parallellgruppe"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Set opp mediegrense"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Vel mediet du vil leggja til i mediegrensa:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Legg til vert"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Skriv inn vertsnamnet eller IP-adressa til verten du vil leggja til:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redigerer parallellgruppa «%s»:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Gruppenamn:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Mediegrense:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Legg til"
 
 #: ../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 "Vertar:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Set opp parallell-urpmi (fleirfordelt køyring av 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 "Mediegrense"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokoll"
+
 #: ../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 "Rediger..."
 
-#: ../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 "Legg til ..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Handtering av nøklar for pakkesignering"
 
-#: ../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 "Nøklar"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "Fann ikkje namnet. Nøkkelen finst ikkje rpm-nøkkelringen."
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Legg til nøkkel"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Vel nøkkelen du vil leggja til mediet «%s»."
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Fjern nøkkel"
 
 #: ../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)"
@@ -479,38 +409,32 @@ msgstr ""
 "(Nøkkelen heiter «%s».)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Legg til nøkkel ..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Fjern nøkkel"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Set opp medium"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "I bruk?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Oppdateringar?"
 
-#: ../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 ""
 "Dette mediet må oppdaterast for å kunna brukast. Vil du oppdatera det no?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -520,38 +444,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Legg til eigendefinert ..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Oppdater ..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Nøklar ..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parallell ..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Globale val ..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../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"
@@ -561,8 +479,7 @@ msgstr ""
 "\n"
 "Vil du halda fram?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -576,8 +493,7 @@ msgstr ""
 "på maskina di. Du kan så installera nye eller oppdaterte program-\n"
 "pakkar frå desse media."
 
-#: ../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,15 +504,25 @@ msgstr ""
 "pakkedatabasen. (Har du andre anna mediehandterings-\n"
 "program oppe, eller installerer du kanskje andre pakkar no?)"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 "Klarte ikkje leggja til medium. Argumenta er anten feil, eller så manglar "
 "dei heilt."
 
-#: ../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 i ferd med å leggja til det nye pakkemediet «%s».\n"
+"Dette medfører at du etterpå kan leggja nye og oppdaterte\n"
+"programpakker frå dette mediet inn på maskina di."
+
+#: ../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 ""
 "Dette medfører at du etterpå kan leggja nye og oppdaterte\n"
 "programpakker frå dette mediet inn på maskina di."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Mediet «%s» er lagt til."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Mediet «%s» er lagt til."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Bruk: %s [VAL] ..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -625,45 +555,38 @@ msgstr ""
 "  --changelog-first      – Vis endringslogg før fillista i "
 "skildringsvindauge.n window"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1, ...   – Avgrens til vald medium."
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     – Føreslå å slå saman alle .rpmnew- og .rpmsave-"
 "filene funne."
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODUS           – Vel modus (install (installer – standard), remove "
 "(fjern), update (oppdater))."
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      – Ikkje spør om stadfesting i oppdateringsmodus."
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      – Ikkje oppdater media ved oppstart."
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        – Ikkje stadfest pakkesignaturar."
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -671,33 +594,27 @@ msgstr ""
 "  --parallel=alias,vert  – Ver i parallellmodus. Bruk «alias»-gruppe og "
 "«vert»-maskin for å visa nødvendige avhengnader."
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pak1,..    – Vis berre desse pakkane."
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pak1,..      – Førehandsvelg desse pakkane."
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 – Tving til å køyrast som «root»."
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pakke         – Søk etter «pakke»."
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Køyrer i brukarmodus"
 
-#: ../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"
@@ -707,634 +624,517 @@ msgstr ""
 "derfor ikkje gjera endringar i systemet. Men du kan likevel\n"
 "sjå igjennom pakkedatabasen etter interessante program."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Tilgjenge"
 
-#: ../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 "Reservekopiering"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "CD-brenning"
 
-#: ../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 "Anna"
 
-#: ../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øker"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Databøker"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Spørsmål og svar"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Hjelpeoppskrifter"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Litteratur"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Klynger"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Meldingssending"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Køtenester"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Kommunikasjon"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Databasar"
 
-#: ../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 "Utvikling"
-
-#: ../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 "Utvikling"
+
+#: ../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 "Kjerne"
 
-#: ../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 "Skriveprogram"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Utdanning"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatorar"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Filverktøy"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Spel"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Eventyrspel"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Spel"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Brettspel"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kortspel"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Tenkespel"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategispel"
 
-#: ../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-basert"
 
-#: ../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 "Bilete"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Overvaking"
 
-#: ../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 "Nettverk"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Nettprat"
 
-#: ../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 "Nettverk"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Filoverføring"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Lynmeldingar"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "E-post"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Diskusjonsgrupper"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Fjerntilgang"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "Verdsveven"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Kontor"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Offentlegnøklar"
 
-#: ../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 "Vitskap"
-
-#: ../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 "Vitskap"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kjemi"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Reknevitskap"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geovitskap"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematikk"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fysikk"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Skal"
 
-#: ../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 "Grunnsystem"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Oppsett"
+#: ../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 "Oppstart"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Oppsett"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakkarhandtering"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Utskrift"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Utrulling"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Utrulling"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Skrifter"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsoll"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Skrifter"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "TrueType"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11-punktbilete"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internasjonalisering"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Maskinvare og kjernen"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Bibliotek"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Tenarar"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminalar"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Tekstverktøy"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Leiker"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Film"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Ikkje tilgjengeleg)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Søkjeresultat"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Søkjeresultat (ingen)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Søkjer. Vent litt ..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Programinstallering"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stopp"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Kan leggjast til"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Oppgraderbar"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Kan leggjast til"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Ikkje valt"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Valt"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Ikkje valt"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Prioritet: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Oppdateringsgrunn: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Inga skildring"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Filer:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Endringslogg:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Medium: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Installert versjon: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versjon: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arkiktektur: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Storleik: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KiB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Prioritet: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Storleik: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Samandrag: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Oppdateringsgrunn: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Beskriving: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Inga skildring"
+#. nicer formatting
+#: ../rpmdrake:654 ../rpmdrake:1193 ../rpmdrake:1313 ../rpmdrake:1716
+#: ../rpmdrake:1900
+msgid "Rpmdrake"
+msgstr "Programinstallering"
 
-#: ../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 "Meir informasjon om pakken ..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Vel"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Du treng éin av desse pakkane:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Vel"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Hentar oversikt over pakkar. Vent litt ..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Inga oppdatering"
 
-#: ../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"
@@ -1344,29 +1144,24 @@ msgstr ""
 "ikkje finst nokon oppdateringar for pakkane på maskina di, eller at du "
 "allereie har installerte dei."
 
-#: ../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 "Meir informasjon"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Pakkeinformasjon"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Nokre andre pakkar må fjernast"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1375,13 +1170,11 @@ msgstr ""
 "Grunna avhengnader må òg desse pakkane fjernast:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Nokre pakkar kan ikkje fjernast"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1389,8 +1182,7 @@ msgstr ""
 "Viss du fjerna desse pakkane ville ikkje systemet ditt fungert lenger:\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"
@@ -1399,13 +1191,11 @@ msgstr ""
 "Grunna avhengnader kan ikkje desse pakkane installerast:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Du treng nokre fleire pakkar"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1414,18 +1204,17 @@ msgstr ""
 "Grunna avhengnader må òg desse pakkane installerast:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (er i «hopp over»-lista)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Kan ikkje installera alle pakkane"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1435,123 +1224,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Nokre pakkar må fjernast"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valt: %d MiB. Ledig plass: %d MiB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Valt: %d MiB"
 
-#: ../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 "Det finst inga beskriving for denne pakken\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Tryggleiksoppdateringar"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Feilrettingar"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Installer"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Vanlege oppdateringar"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Installer"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s val"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-val"
 
-#: ../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 pakkar (alfabetisk)"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Alle pakkar (gruppert)"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Alle pakkar (etter oppdateringsstatus)"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Alle pakkar (etter storleik)"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Alle pakkar (etter valstatus)"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Alle pakkar (etter plassering)"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Alle pakkar (etter oppdateringsstatus)"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Berre blad (sortert etter installeringsdato)"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Alle pakkar (gruppert)"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Vanlege oppdateringar"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Feilrettingar"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Vanlege oppdateringar"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Tryggleiksoppdateringar"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "i namn"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "i beskrivingar"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "i filnamn"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Vanleg informasjon"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Detaljert informasjon"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Du må velja nokre pakkar først."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "For mange pakkar valde"
 
 #: ../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 +1341,7 @@ msgstr ""
 "Er du heilt sikker på at du vil prøva å installera alle pakkane?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1581,89 +1355,100 @@ msgstr ""
 "\n"
 "Vil du halda fram?"
 
-#: ../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 "/_Fil"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Oppdater medium"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Fjern all merking"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Last pakkelista om att"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Avslutt"
 
-#: ../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 "/_Val"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Vis automatiske valde pakkar"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../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 "Oppdater programvare"
+
+#. -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 "Søk etter:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Søk"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Tøm"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installer"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Kritisk feil"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Det oppstod ein kritisk feil: %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 +1460,12 @@ msgstr ""
 "\n"
 "Vil du halda fram?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Oppdateringsmediet finst allereie"
 
-#: ../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 +1480,12 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Korleis velja spegel manuelt"
 
-#: ../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"
@@ -1715,58 +1498,56 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Ser etter tilgjengelege pakkar. Vent litt ..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Les pakkedatabase. Vent litt ..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Granskar %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "endringar:"
 
-#: ../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 "Bruk .%s som hovudfil"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ikkje gjer noko"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Installeringa er fullført"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Gransk ..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Alle pakkane vart rett installert."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Feil ved installering"
 
-#: ../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"
@@ -1776,18 +1557,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Klarte ikkje henta kjeldepakkar."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Klarte ikkje henta kjeldepakkar. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1799,38 +1579,34 @@ msgstr ""
 "Feil:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Installerer pakke ..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Gjer klar ..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Installerer pakke ..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Endra medium"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Set inn «%s» i eininga [%s]."
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Lastar ned pakken «%s» (%s av %s) ..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Stadfestar pakkesignaturar ..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1844,13 +1620,12 @@ msgstr ""
 "\n"
 "Vil du likevel halda fram installeringa?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Feil ved installering."
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1862,23 +1637,21 @@ msgstr ""
 "\n"
 "Du bør oppdatera mediedatabasen."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Førebur pakkeinstallering ..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakken «%s» (%s/%s) ..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "Klarte ikkje lesa rpm-fil [%s]."
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1891,43 +1664,33 @@ msgstr ""
 "«.rpmnew» eller «.rpmsave». Du kan sjå nøyare på\n"
 "desse, og eventuelt gjera endringar:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Desse pakkane inneheld oppgraderingsinformasjon"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Meir informasjon om pakken ... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Fann ingen pakkar som kan installerast."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Kritisk feil: Fann ingen pakkar for installering."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Les pakkedatabase. Vent litt ..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Fjernar pakkar. Vent litt ..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Feil ved fjerning"
 
-#: ../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"
@@ -1950,8 +1712,8 @@ msgstr ""
 "Her kan du letta finna og fjerna dei programma du ikkje lenger\n"
 "ønskjer å ha på maskina di."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1963,13 +1725,11 @@ msgstr ""
 "Her kan du lett finna dei oppdateringane du ønskjer å installera\n"
 "på maskina di."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Velkommen til programinstalleringa!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1983,214 +1743,172 @@ msgstr ""
 "systemet. Med dette verktøyet kan du lett velja kven avdesse\n"
 "du vil installera på maskina di."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Programoppdatering"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Oppdater programvare"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Programoppdatering"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Skriv inn brukarnamn og passord for tilgang til mellomtenar\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Brukarnamn:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Fjerning av programpakkar"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Oppdatering av programpakkar"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Installering av programpakkar"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nei"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informasjon ..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Austerrike"
 
-#: ../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 "Brasil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: ../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 "Tsjekkia"
 
-#: ../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 "Hellas"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spania"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Frankrike"
 
-#: ../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 "Italia"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Nord-Korea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Noreg"
 
-#: ../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 "Sverige"
 
-#: ../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 "Storbritannia"
 
-#: ../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 "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"
@@ -2202,8 +1920,7 @@ msgstr ""
 "\n"
 "Vil du halda fram?"
 
-#: ../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"
@@ -2215,23 +1932,26 @@ msgstr ""
 "\n"
 "Vil du halda fram?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s val"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Henta spegeladresser frå Internett. Vent litt."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Henta spegeladresser frå Mandriva-nettstaden. Vent litt."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Feil ved nedlasting"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2245,8 +1965,8 @@ msgstr ""
 "Moglege grunnar kan vera at nettstaden eller nettverket er nede.\n"
 "Prøv på nytt seinare."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2260,18 +1980,15 @@ msgstr ""
 "Moglege grunnar kan vera Mandriva-nettstaden eller nettverket er nede.\n"
 "Prøv på nytt seinare."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Ingen spegel"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Finn ikkje ein passande spegel."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2285,69 +2002,64 @@ msgstr ""
 "offisielle oppdateringar for prosessorarkitekturen din ikkje\n"
 "er støtta."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Vel spegel."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierer fil for mediet «%s» ..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Granskar fila til mediet «%s» ..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Granskar fjernfila til mediet «%s» ..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " fullført."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " mislykka."
 
 #. -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 frå mediet %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Startar nedlasting av «%s» ..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Lastar ned «%s». Tid igjen: %s. Fart: %s."
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Lastar ned «%s». Fart: %s."
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Oppdaterer medium. Vent litt ..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Feil ved henting av pakkar"
 
-#: ../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,35 +2075,30 @@ msgstr ""
 "mediet, og så leggja det til på nytt. Om mediet ikkje\n"
 "er tilgjengeleg bør du prøva på nytt seinare."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Oppdater medium"
 
-#: ../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 ""
 "Fann ingen aktive medium. Du må aktivera mediuma før du kan oppdatera dei."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Vel mediet du vil oppdatera:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Merk alle"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2403,8 +2110,8 @@ msgstr ""
 "Feil:\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"
@@ -2414,18 +2121,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Klarte ikkje leggja til mediet."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Feil ved forsøk på å leggja til medium"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2435,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"
@@ -2446,8 +2151,8 @@ msgstr ""
 "du køyrer (%s).\n"
 "Det vert derfor sett ut av bruk."
 
-#: ../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"
@@ -2457,13 +2162,11 @@ msgstr ""
 "Linux-versjonen du køyrer (%s).\n"
 "Det vert derfor sett ut av bruk."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Hjelpa er starta opp i bakgrunnen"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "Hjelpevindauget er no starta, og vil snart dukka opp på skrivebordet."
@@ -2738,6 +2441,18 @@ msgstr "Fjern programvare"
 msgid "Software Media Manager"
 msgstr "Mediehandtering"
 
+#~ msgid "Stop"
+#~ msgstr "Stopp"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Alle pakkar (etter plassering)"
+
+#~ msgid "Normal information"
+#~ msgstr "Vanleg informasjon"
+
+#~ msgid "Maximum information"
+#~ msgstr "Detaljert informasjon"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "Alt vart rett installert"
 
diff --git a/po/pa_IN.po b/po/pa_IN.po
index a3527771..30eaeadc 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.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: 2005-03-27 00:43+0530\n"
 "Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
 "Language-Team: Panjabi <fedora-trans-pa@redhat.com>\n"
@@ -14,13 +15,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"
@@ -42,18 +41,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 "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 "ਜੇਕਰ ਖਾਲੀ ਛੱਡਿਆ ਤਾਂ ਸੰਸਲੇਸ਼ਣ/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 "ਇੰਸਟਾਲ ਹੋਣ ਵਾਲੇ 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 "ਵਿਆਪਕ ਪਰਾਕਸੀ ਵਿਵਸਥਾ"
 
 #: ../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 ""
 ">):"
 
 #: ../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)"
@@ -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,89 +527,80 @@ 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 ""
 
-#: ../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"
@@ -690,634 +610,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 "Archiving"
 
-#: ../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 "ਕਿਵੇਂ"
 
-#: ../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 "Emulators"
 
-#: ../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 "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 "Geosciences"
 
-#: ../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 "Deploiement"
 
-#: ../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 "Changelog:\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"
@@ -1327,29 +1130,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 +1157,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 +1169,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 +1179,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 +1193,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 +1213,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 +1331,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 +1345,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"
@@ -1662,13 +1450,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 +1471,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"
@@ -1704,58 +1490,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"
@@ -1765,18 +1549,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"
@@ -1788,38 +1571,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"
@@ -1833,13 +1612,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"
@@ -1851,23 +1629,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"
@@ -1879,43 +1656,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"
@@ -1925,8 +1692,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1938,8 +1704,8 @@ msgstr ""
 "ਇਹ ਸੰਦ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਤੋਂ ਸਾਫਟਵੇਅਰ ਹਟਾਉਣ ਲਈ ਸਹਿਯੋਗ\n"
 "ਕਰੇਗਾ।"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1951,13 +1717,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"
@@ -1971,214 +1735,173 @@ 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
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "ਸਾਫਟਵੇਅਰ ਨਵੀਨੀਕਰਨ"
+
+#: ../rpmdrake.pm:129
 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"
@@ -2190,8 +1913,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"
@@ -2203,24 +1925,27 @@ 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 +1959,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 +1974,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 +1996,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"
@@ -2351,34 +2068,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"
@@ -2390,8 +2102,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"
@@ -2401,18 +2113,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"
@@ -2422,8 +2132,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"
@@ -2433,8 +2143,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"
@@ -2444,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 "ਸਹਾਇਤਾ ਝਰੋਖਾ ਚਲਾਇਆ ਗਿਆ ਹੈ, ਇਹ ਛੇਤੀ ਹੀ ਤੁਹਾਡੇ ਵਿਹੜੇ ਵਿੱਚ ਹੋਏਗਾ।"
@@ -2725,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/pl.po b/po/pl.po
index e0f6f592..7a4b92b4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pl\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-01 10:53+0200\n"
 "Last-Translator: Tomasz Bednarski <bednarski@skrzynka.pl>\n"
 "Language-Team: \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 "Wybierz rodzaj nośnika"
 
-#: ../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 ""
 "będziesz\n"
 "przeprowadzić procedurę dwa razy)."
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Nośniki dystrybucji"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Aktualizacje edycji Official"
 
-#: ../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,106 +76,87 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Proszę czekać, dodawanie nośnika..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Dodawanie nośnika"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokalne pliki"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Ścieżka:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Serwer 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 "Serwer FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Serwer HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Napęd wymienny"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Ścieżka lub punkt montowania:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Napęd wymienny"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Przeglądaj..."
 
-#: ../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 "Hasło:"
 
-#: ../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 "Względna ścieżka do pliku syntezy/hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 "Po pozostawieniu pola pustym, automatycznie będzie sprawdzany plik syntezy/"
 "hdlist"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nazwa:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Stwórz nośnik dla całej dystrybucji"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Wybierz nośnik(i) do aktualizacji"
 
-#: ../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 "Należy wypełnić co najmniej dwa pierwsze pola."
 
-#: ../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 ""
 "Już istnieje nośnik o tej nazwie, czy naprawdę\n"
 "chcesz go zastąpić?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Dodawanie nośnika:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Rodzaj nośnika:"
 
@@ -200,10 +176,9 @@ msgstr "Rodzaj nośnika:"
 #: ../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 "Anuluj"
 
@@ -212,101 +187,86 @@ msgstr "Anuluj"
 #: ../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 "Ogólne ustawienia dla instalacji pakietów"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "zawsze"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nigdy"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Weryfikacja instalowanych pakietów RPM:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Pobieranie programu do:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Usuwanie źródeł"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Czy na pewno chcesz usunąć nośnik \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Proszę czekać, usuwanie nośnika..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Modyfikacja nośnika"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Modyfikowanie nośnika \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Zapisz zmiany"
 
-#: ../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 "Pośrednik..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Włóż nośnik, aby kontynuować"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "By zapisać zmiany, należy włożyć nośnik do napędu."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Konfiguracja serwera proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Ustawienia pośrednika dla nośnika \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globalne ustawienia pośrednika"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -315,139 +275,113 @@ msgstr ""
 "(składnia: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Serwer pośrednika:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Możesz podać użytkownika/hasło dla uwierzytelniania pośrednika:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Użytkownik:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Dodawanie grupy równoległej"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Edycja grupy równoległej"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Dodawanie ograniczenia nośnika"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Wybierz nośnik do dodania w ograniczeniu nośnika:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Dodaj komputer"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Wpisz nazwę komputera do dodania lub jego adres IP:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Modyfikowanie grupy równoległej \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokół:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Ograniczenie nośnika:"
 
 #: ../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 "Usuń"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Komputery:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfiguracja równoległego urpmi (rozproszone wykonywanie urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grupa"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokół"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Ograniczenie nośnika"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokół"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Polecenie"
 
-#: ../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 "(brak)"
 
-#: ../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 "Modyfikuj..."
 
-#: ../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 "Zarządzaj kluczami dla podpisów cyfrowych pakietów"
 
-#: ../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 "Nośnik"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -456,27 +390,24 @@ msgstr ""
 "Klucze"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "nie znaleziono nazwy, klucz nie istnieje w zbiorze kluczy rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Dodaj klucz"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Wybierz klucz do dodania do nośnika %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Usuń klucz"
 
 #: ../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 +416,31 @@ msgstr ""
 "(nazwa klucza: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Dodaj klucz..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Usuń klucz"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Konfiguracja nośników"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Włączone?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Aktualizacje?"
 
-#: ../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 +450,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Dodaj dowolny..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Aktualizuj..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Zarządzaj kluczami..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Równolegle..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Ogólne ustawienia..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../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 +485,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -581,8 +499,7 @@ msgstr ""
 "używane na komputerze. Będą one dostępne w celu instalacji nowych pakietów\n"
 "oprogramowania lub przy przeprowadzaniu aktualizacji."
 
-#: ../edit-urpm-sources.pl: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 +511,23 @@ msgstr ""
 "uruchomionego innego menedżera nośników lub też\n"
 "aktualnie instalowane są jakieś pakiety?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Nie można dodać nośnika, brak argumentów lub są one nieprawidłowe"
 
-#: ../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 ""
+"Za chwilę zostanie dodany nowy nośnik pakietów, \"%s\".\n"
+"To oznacza, że będzie możliwość dodawania nowych pakietów\n"
+"oprogramowania do systemu z tego nowego nośnika."
+
+#: ../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 ""
 "To oznacza, że będzie możliwość dodawania nowych pakietów\n"
 "oprogramowania do systemu z tego nowego nośnika."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Pomyślnie dodano nośnik \"%s\"."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Pomyślnie dodano nośnik \"%s\"."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Użycie: %s [OPCJA]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -629,46 +560,39 @@ msgstr ""
 "  --changelog-first      wyświetla listę zmian w oknie opisu przed podaniem "
 "listy plików"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     ograniczenie do oznaczonego nośnika"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     proponuje połączenie wszystkich odnalezionych "
 "plików .rpmnew/.rpmsave files found"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            wybór trybu (instalacja (domyślny), usuwanie, "
 "aktualizacja)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      w trybie aktualizacji pomija pytanie o "
 "potwierdzenie "
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      pomija aktualizację nośników przy starcie"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        pomija weryfikację podpisów pakietów"
 
-#: ../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  działa w trybie równoległym , użyj grupy \"alias\", "
 "użyj nazwy komputera  \"host\" do wskazania wymaganych zależności"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    wyświetla wskazane pakiety"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      preselekcja podanych pakietów"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 wymusza uruchomienie jako root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           szuka wyrażenia \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Uruchamianie w trybie użytkownika"
 
-#: ../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 ""
 "Nie będzie można przeprowadzać modyfikacji w systemie,\n"
 "lecz wciąż można będzie przeglądać istniejącą bazę danych."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Dostępność"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archiwizacja"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Archiwizacja"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Wypalanie płyt CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Komprecja"
 
-#: ../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 "Inne"
 
-#: ../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 "Książki"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Książki komputerowe"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Faq"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Dokumenty HOWTO"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Klaster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Przekazywanie wiadomości"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Usługi kolejkowania"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikacja"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Bazy Danych"
 
-#: ../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 "Rozwijanie programu"
-
-#: ../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 "Rozwijanie programu"
+
+#: ../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 "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 "Edytory"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Edukacja"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatory"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Narzędzia plikowe"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Gry"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Przygodowe"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Gry"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Przygodowe"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Planszowe"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Karty"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzzle"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sportowe"
 
-#: ../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 "Pulpit graficzny"
-
-#: ../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 "Pulpit graficzny"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Oparte 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 "Monitorowanie"
 
-#: ../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 "Sieć"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Pogawędki"
 
-#: ../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 "Sieć"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Przesyłanie plików"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Komunikatory"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Poczta"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Nowości"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Zdalny dostęp"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Biuro"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Klucze publiczne"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publikowanie"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Nauka"
-
-#: ../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 "Nauka"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chemia"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Technika komputerowa"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Nauka o Ziemi"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematyka"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fizyka"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Powłoki"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../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 "Podstawowe"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfiguracja"
+#: ../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 "Uruchamianie i inicjalizacja"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Sprzęt"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakowanie"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Drukowanie"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Rozmieszczanie"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Rozmieszczanie"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Czcionki"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsola"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Czcionki"
+
+#: ../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 "Internacjonalizacja"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Jądro i sprzęt"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Biblioteki"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Serwery"
 
-#: ../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 "Narzędzia tekstowe"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Zabawki"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Wideo"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Niedostępne)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Wyniki wyszukiwania"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Wyniki wyszukiwania (brak)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Proszę czekać, wyszukiwanie..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Zatrzymaj"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Dodawalne"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Aktualizowalne"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Dodawalne"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Nie wybrane"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Wybrane"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Nie wybrane"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Ważność: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Przyczyna uaktualnienia: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Brak opisu"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Plików:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Dziennik zmian:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Nośnik: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Aktualnie zainstalowana wersja: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Wersja: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Architektura: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Rozmiar: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Ważność: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Rozmiar: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Podsumowanie: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Przyczyna uaktualnienia: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Brak opisu"
+#. 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 "Więcej informacji o pakiecie..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Proszę wybrać"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Wymagany jest jeden z poniższych pakietów:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Proszę wybrać"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Proszę czekać, wypisywanie pakietów..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Brak aktualizacji"
 
-#: ../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,29 +1150,24 @@ msgstr ""
 "dostępnych aktualizacji dla zainstalowanych pakietów lub też\n"
 "już zainstalowano wszystkie aktualizacje."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Wszystko"
 
 #. -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 "Więcej info"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informacje o pakietach"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Zostanie usuniętych kilka dodatkowych pakietów"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1381,13 +1177,11 @@ msgstr ""
 "usunięte:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Nie można usunąć niektórych pakietów"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1395,8 +1189,7 @@ msgstr ""
 "Niestety, usunięcie tych pakietów może spowodować uszkodzenie systemu:\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"
@@ -1406,13 +1199,11 @@ msgstr ""
 "teraz odznaczone:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Wymagane są dodatkowe pakiety"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1422,18 +1213,17 @@ msgstr ""
 "zostać zainstalowane:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (należy do listy pominięć)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Nie można zainstalować niektórych pakietów"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1443,123 +1233,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Niektóre pakiety muszą zostać usunięte"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Wybranych: %d MB / Miejsce na dysku: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Wybrany rozmiar: %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 jest niedostępny dla tego pakietu\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Aktualizacje z dziedziny bezpieczeństwa"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Aktualizacje poprawiające błędy"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Zainstaluj"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Zwykłe aktualizacje"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Zainstaluj"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "do wyboru %s"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Lista wyboru 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 "Wszystkie pakiety, alfabetycznie"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Wszystkie pakiety, według grupy"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Wszystkie pakiety, według dostępności aktualizacji"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Wszystkie pakiety, według rozmiaru"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Wszystkie pakiety, według stanu zaznaczenia"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Wszystkie pakiety, według repozytorium nośników"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Wszystkie pakiety, według dostępności aktualizacji"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Tylko liście, uporządkowane według daty instalacji"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Wszystkie pakiety, według grupy"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Zwykłe aktualizacje"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Aktualizacje poprawiające błędy"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Zwykłe aktualizacje"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Aktualizacje z dziedziny bezpieczeństwa"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "w nazwach"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "w opisach"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "w nazwach plików"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Podstawowe informacje"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maksimum informacji"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Należy najpierw wybrać jakieś pakiety."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Wybrano zbyt wiele pakietów"
 
 #: ../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"
@@ -1576,7 +1351,7 @@ msgstr ""
 "Czy naprawdę chcesz zainstalować wszystkie zaznaczone pakiety?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1590,89 +1365,100 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../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 "/_Plik"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Aktualizacja nośnika(-ów)"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Usuń zaznaczenie"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Przeładuj listę _pakietów"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Zakończ"
 
-#: ../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 "/_Opcje"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/P_okaż automatycznie wybrane pakiety"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Pomoc"
 
-#: ../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 "Aktualizacja 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 "Znajdź:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Wyszukaj"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Zainstaluj"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Poważny błąd"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Wystąpił poważny błąd: %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"
 "Czy chcesz kontynuować?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Już istniejące nośniki aktualizacyjne"
 
-#: ../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"
 "Następnie uruchom ponownie %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Sposób ręcznego wyboru serwera zwierciadlanego"
 
-#: ../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"
 "Potem należy ponownie uruchomić %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Sprawdzanie %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "zmiany:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Usuń %s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Użyj .%s jako plik podstawowy"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Nic nie rób"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalacja zakończona"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Sprawdź..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Wszystkie żądane pakiety zostały pomyślnie zainstalowane."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Wystąpił problem podczas instalacji"
 
-#: ../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 "Nie można pobrać pakietów źródłowych."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Niestety, nie można pobrać pakietów źródłowych. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1811,38 +1592,34 @@ msgstr ""
 "Zgłoszono błąd(błędy):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalacja pakietów..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicjalizacja..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalacja pakietów..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Zmień nośnik"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Wsuń nośnik oznaczony \"%s\" do urządzenia [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Pobieranie pakietu \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Weryfikowanie podpisów pakietów..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1856,13 +1633,12 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować instalację?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalacja zakończona niepowodzeniem"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1874,23 +1650,22 @@ msgstr ""
 "\n"
 "Może zachodzić potrzeba aktualizacji bazy danych nośników."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Przygotowywanie instalacji pakietów..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "nie można uzyskać dostępu do pliku rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1902,43 +1677,33 @@ msgstr ""
 "Pewne pliki konfiguracyjne zostały utworzone jako `.rpmnew' lub `.rpmsave',\n"
 "Można je sprawdzić aby podjąć odpowiednie działanie:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Te pakiety zawierają także informacje o uaktualnieniach"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Więcej informacji o pakiecie... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nie znaleziono pakietu do instalacji."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Nierozpoznany błąd: nie znaleziono pakietu do instalacji, sorry."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Proszę czekać, usuwanie pakietów..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problem podczas usuwania"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1948,8 +1713,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1961,8 +1725,8 @@ msgstr ""
 "To narzędzie pomoże ci wybrać programy, które mogą zostać usunięte\n"
 "z komputera."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1974,13 +1738,11 @@ msgstr ""
 "To narzędzie pomoże ci wybrać aktualizacje, które możesz chcieć\n"
 "zainstalować na tym komputerze."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Witamy w programie instalacyjnym!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1994,214 +1756,172 @@ msgstr ""
 "pakietów oprogramowania na płycie CD lub DVD. To narzędzie pomoże ci\n"
 "wybrać pakiety, które można zainstalować na komputerze."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Uaktualnianie pakietów oprogramowania"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Aktualizacja Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Uaktualnianie pakietów oprogramowania"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Aby uzyskać dostęp do proxy wprowadź dane uwierzytelniające\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Nazwa użytkownika:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Usuwanie pakietów oprogramowania"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Uaktualnianie pakietów oprogramowania"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalacja pakietów oprogramowania"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nie"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Tak"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informacja ..."
 
-#: ../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 "Belgia"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazylia"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Szwajcaria"
 
-#: ../rpmdrake.pm:382
-#, c-format
+#: ../rpmdrake.pm:387
 msgid "Costa Rica"
 msgstr "Kostaryka"
 
-#: ../rpmdrake.pm:383
-#, c-format
+#: ../rpmdrake.pm:388
 msgid "Czech Republic"
 msgstr "Czechy"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Niemcy"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Dania"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grecja"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Hiszpania"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Francja"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Węgry"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Włochy"
 
-#: ../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 "Holandia"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polska"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rosja"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Szwecja"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Słowacja"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Tajwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Wielka Brytania"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Chiny"
 
-#: ../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 "Stany Zjednoczone"
 
-#: ../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"
@@ -2214,8 +1934,7 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../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"
@@ -2228,23 +1947,26 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "do wyboru %s"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Proszę czekać, pobieranie adresów serwerów zwierciadlanych."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Proszę czekać, pobieranie adresów serwerów zwierciadlanych."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Błąd podczas pobierania"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2258,8 +1980,8 @@ msgstr ""
 "Sieć lub strona www Mandriva mogą być niedostępne.\n"
 "Spróbuj później ponownie."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2273,18 +1995,15 @@ msgstr ""
 "Sieć lub strona www Mandriva mogą być niedostępne.\n"
 "Spróbuj później ponownie."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Brak serwerów zwierciadlanych"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Odnalezienie odpowiedniego serwera zwierciadlanego jest niemożliwe."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2298,69 +2017,64 @@ msgstr ""
 "gdy architektura tego procesora nie jest obsługiwana przez Oficjalne\n"
 "Aktualizacje Pakietów Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Wybierz serwer zwierciadlany."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiowanie pliku dla nośnika \"%s\"..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Badanie pliku nośnika \"%s\"..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Badanie zdalnego pliku nośnika \"%s\"..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " gotowe."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " niepowodzenie!"
 
 #. -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 z nośnika %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Rozpoczynanie pobierania pakietu \"%s\"..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Pobieranie pakietu \"%s\", czas zakończenia:%s, szybkość:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Pobieranie pakietu \"%s\", szybkość:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Proszę czekać, aktualizacja nośnika..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Błąd podczas pobierania pakietów"
 
-#: ../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"
@@ -2375,34 +2089,29 @@ msgstr ""
 "usunąć i ponownie dodać w celu ponownej konfiguracji. Inną przyczyną\n"
 "może być niedostępność pakietu i należy spróbować jeszcze raz później."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Aktualizacja nośnika(-ów)"
 
-#: ../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 "Wybierz nośnik(i) do aktualizacji:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Zaznacz wszystko"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2413,8 +2122,8 @@ msgstr ""
 "Błędy:\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"
@@ -2424,18 +2133,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Nie można utworzyć nośnika."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Niepowodzenie podczas dodawania nośnika"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2445,8 +2152,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"
@@ -2456,8 +2163,8 @@ msgstr ""
 "używasz (%s).\n"
 "Zostanie on wyłączony."
 
-#: ../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"
@@ -2467,13 +2174,11 @@ msgstr ""
 "systemu Mandriva Linux (%s).\n"
 "Zostanie on wyłączony."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Pomoc uruchomiona w tle"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2749,6 +2454,18 @@ msgstr "Usuwanie oprogramowania"
 msgid "Software Media Manager"
 msgstr "Menedżer nośników oprogramowania"
 
+#~ msgid "Stop"
+#~ msgstr "Zatrzymaj"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Wszystkie pakiety, według repozytorium nośników"
+
+#~ msgid "Normal information"
+#~ msgstr "Podstawowe informacje"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maksimum informacji"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "wszystko zostało pomyślnie zainstalowane"
 
diff --git a/po/pt.po b/po/pt.po
index ef5b0bb9..ce3eb35f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -18,7 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt\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-12 21:03+0100\n"
 "Last-Translator: Zé <mmodem00@netvisao.pt>\n"
 "Language-Team:  <en@li.org>\n"
@@ -28,13 +29,11 @@ msgstr ""
 "X-Generator: KBabel 1.11.2\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 "Escolha o tipo 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"
@@ -56,18 +55,16 @@ msgstr ""
 "ou fontes que fornecem as actualizações oficiais para a sua distribuição.\n"
 "(Pode adicionar ambas, mas irá ter de o fazer em dois passos.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Fontes de distribuição"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Actualizações 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"
@@ -85,104 +82,85 @@ msgstr ""
 "\n"
 "Deseja prosseguir?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Por favor aguarde, a adicionar a média..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Adicionar média"
 
-#: ../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 "Localização:"
 
-#: ../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 removível"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Localização ou ponto de montagem:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Dispositivo removível"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Pesquisar..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Autenticação:"
 
-#: ../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 "Senha:"
 
-#: ../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 "Localização relativa para o 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 deixado em branco, o synthesis/hdlist será automáticamente verificado"
+msgstr ""
+"Se deixado em branco, o synthesis/hdlist será automáticamente verificado"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nome:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Criar média para toda a distribuição"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Procurar nesta média por actualizações"
 
-#: ../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 "Precisa preencher pelo menos as duas 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?"
@@ -190,13 +168,11 @@ msgstr ""
 "Já existe uma média com este nome, deseja\n"
 "realmente substitui-la?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Adicionar média:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tipo de média:"
 
@@ -204,10 +180,9 @@ msgstr "Tipo 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 "Cancelar"
 
@@ -216,100 +191,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 "Ok"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Opções globais para a instalação dos pacotes"
 
 #: ../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 a instalar:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Programa a usar para transferências:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Remoção da Fonte"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Tem certeza que deseja remover a fonte \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Por favor aguarde, a remover a média..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Editar média"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "A editar a média \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Gravar alterações"
 
-#: ../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 "Precisa inserir a média 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."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "Para gravar as alterações, precisa inserir a média no dispositivo."
 
 #: ../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 "Configuração proxy para a média \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Configuração global 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]>):"
@@ -318,166 +279,137 @@ msgstr ""
 "(sintaxe: <endereçodoproxy[:porta]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Nome do endereço proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Pode especificar um utilizador/senha para a autenticação do proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Utilizador:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Adicionar um grupo paralelo"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Editar um grupo paralelo"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Adicionar um limite de média"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Escolha uma média para adicionar no limite da média:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Adicionar um endereço"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Digite o nome ou o IP do endereço a adicionar:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "A editar o grupo paralelo \"%s\":"
 
 #: ../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 "Limite da média:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Adicionar"
 
 #: ../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 "Remover"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Endereços:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configurar urpmi paralelo (execução 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 "Limite da média"
 
+#: ../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 "(nenhum)"
 
-#: ../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 "Adicionar..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Gerir chaves para as assinaturas digitais dos pacotes"
 
-#: ../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 "Chaves"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "nenhum nome encontrado, a chave não existe na lista rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Adicionar uma chave"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Escolha uma chave para adicionar à média %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Remover uma chave"
 
 #: ../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 +418,31 @@ msgstr ""
 "(nome da chave: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Adicionar uma chave..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Remover chave"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Configurar médias"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Activado?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Actualizações?"
 
-#: ../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 "Esta média precisa ser actualizada para ser usada. Actualizar agora?"
 
-#: ../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 +452,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Adição personalizada ..."
 
-#: ../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 "Gerir chaves..."
 
-#: ../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 "Opções globais..."
 
-#: ../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 +487,7 @@ msgstr ""
 "\n"
 "Deseja prosseguir?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -582,8 +501,7 @@ msgstr ""
 "deseja usar no seu computador. Irão então estar disponíveis para\n"
 "instalar novos pacotes de software ou para executar actualizações."
 
-#: ../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"
@@ -595,13 +513,23 @@ msgstr ""
 "de dados dos pacotes (tem outro gestor de médias noutro\n"
 "ecrã, ou está actualmente também a instalar pacotes?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Não foi possível adicionar a média, argumentos errados ou em falta"
 
-#: ../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á prestes a adicionar uma nova média de pacotes, '%s'.\n"
+"Isso significa que irá ser capaz de adicionar novos pacotes de software\n"
+"ao seu sistema a partir dessa nova 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"
@@ -611,18 +539,22 @@ msgstr ""
 "Isso significa que irá ser capaz de adicionar novos pacotes de software\n"
 "ao seu sistema a partir dessa nova média."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Média `%s' adicionada com sucesso."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Média `%s' adicionada com sucesso."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Uso: %s [OPÇÃO]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -630,42 +562,37 @@ msgstr ""
 "  --changelog-first      mostra as evoluções antes da lista dos ficheiros na "
 "janela da descrição"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     limita-se à média indicada"
 
-#: ../rpmdrake:38
-#, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+#: ../rpmdrake:41
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     propõe de combinar todos os fichieros .rpmnew/."
 "rpmsave files encontrados"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            define o modo (install (por omissão), remove, "
 "update)"
 
-#: ../rpmdrake:40
-#, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+#: ../rpmdrake:43
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      não pede confirmação em modo actualização"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      não actualiza as médias ao iniciar"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        não verifica as assinaturas dos pacotes"
 
-#: ../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 +600,27 @@ msgstr ""
 "  --parallel=alias,host  estar em modo paralelo, usa o grupo \"alias\", usa "
 "a máquina \"host\" para mostrar as dependências necessárias"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    mostra só estes pacotes"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      pré-selecciona estes pacotes"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 força a execução como root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           procura pelo \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "A correr em modo utilizador"
 
-#: ../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 +630,517 @@ msgstr ""
 "Não irá poder fazer modificações no seu sistema, mas\n"
 "poderá ainda procurar na base de dados existente."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Acessibilidade"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arquivar"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Cópia de Segurança"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Gravação de CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compressão"
 
-#: ../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 "Livros"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Livros de computadores"
 
-#: ../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
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Passagem de Mensagens"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Serviços de Fila"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Comunicações"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Bases de Dados"
 
-#: ../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 "Programação"
-
-#: ../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 "Programação"
+
+#: ../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 "Educação"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emuladores"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Ferramentas de Ficheiros"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Jogos"
-
-#: ../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 "Jogos"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcada"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Tabuleiros"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cartas"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzzles"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Desporto"
 
-#: ../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 "Ecrã 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 "Ecrã Gráfico"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Baseado em 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 "Monitorização"
 
-#: ../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 "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 "Transferir Ficheiros"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Mensageiros"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Correio Eletrônico"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Noticias"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Acesso Remoto"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Escritório"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Chaves Públicas"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publicar"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Ciências"
-
-#: ../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ências"
+
+#: ../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ência de Computação"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geociências"
 
-#: ../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 "Linhas de Comando"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Som"
 
-#: ../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 "Configuração"
+#: ../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 Inicialização"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configuração"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pacotes"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Imprimir"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Distribuição"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Distribuição"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Tipos de Letra"
-
-#: ../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 "Tipos de Letra"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Tipo1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalização"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel e Hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Livrarias"
 
-#: ../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 "Ferramentas de Texto"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Brinquedos"
 
-#: ../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 "(Não disponível)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Resultados da pesquisa"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Resultados da pesquisa (nenhum)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Por favor aguarde, a procurar..."
 
-#: ../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 "Adicionável"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Actualizavel"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Adicionável"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Não seleccionado"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Seleccionado"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Não seleccionado"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importância: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Motivo de actualização: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Sem descrição"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Ficheiros:\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 "Versão actualmente instalada: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versão: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arquitectura: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Tamanho: "
-
-#: ../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 "Tamanho: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Sumário: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Motivo de actualização: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Descrição: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Sem descrição"
+#. 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 "Mais informação no pacote..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Por favor escolha"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Um dos seguintes pacotes é necessário:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Por favor escolha"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Por favor aguarde, a listar os pacotes..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Nenhuma actualização"
 
-#: ../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"
@@ -1346,29 +1150,24 @@ msgstr ""
 "há actualizações disponíveis para os pacotes instalados no seu\n"
 "computador, ou já está tudo instalado."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Tudo"
 
 #. -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 "Mais info"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informação nos pacotes"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Alguns pacotes adicionais precisam ser removidos"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1378,13 +1177,11 @@ msgstr ""
 "também precisa(m) ser removido(s):\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Alguns pacotes não podem ser removidos"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1392,8 +1189,7 @@ msgstr ""
 "A remoção destes pacotes pode danificar o seu sistema, desculpe:\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"
@@ -1403,13 +1199,11 @@ msgstr ""
 "deve(m) ser desmarcado(s):\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Pacotes adicionais necessários"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1419,18 +1213,17 @@ msgstr ""
 "também precisam ser instalados:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (pertence à lista omitida)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Alguns pacotes não podem ser instalados"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1440,123 +1233,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Alguns pacotes precisam ser removidos"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seleccionado: %d MB / Espaço livre no disco: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Tamanho 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 "Descrição não disponível para este pacote\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Actualizações de segurança"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizações de correcções de erros"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instalar"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Actualizações normais"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instalar"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s escolhas"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Escolhas 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 os pacotes, alfabéticamente"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Todos os pacotes, por grupo"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Todos os pacotes, por disponibilidade de actualização"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Todos os pacotes, por tamanho"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Todos os pacotes, por estado de selecção"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Todos os pacotes, por média de origem"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Todos os pacotes, por disponibilidade de actualização"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Apenas folhas, por data de instalação"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Todos os pacotes, por grupo"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Actualizações normais"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Actualizações de correcções de erros"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Actualizações normais"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Actualizações de segurança"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "nos nomes"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "nas descrições"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "nos nomes dos ficheiros"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informação normal"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Informação completa"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Precisa seleccionar alguns pacotes primeiro."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Demasiados pacotes seleccionados"
 
 #: ../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"
@@ -1573,7 +1351,7 @@ msgstr ""
 "Deseja realmente instalar todos os pacotes seleccionados?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1587,89 +1365,100 @@ msgstr ""
 "\n"
 "Deseja prosseguir?"
 
-#: ../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 "/Act_ualizar média"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Restaurar selecção"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Recarregar lista de _pacotes"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Sair"
 
-#: ../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 "/_Opções"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Mostrar pacotes seleccionados automaticamente"
 
-#: ../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 "Actualização 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 "Pesquisar:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Procurar"
 
-#: ../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 "Sair"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Erro fatal"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Ocorreu um erro 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"
@@ -1681,13 +1470,12 @@ msgstr ""
 "\n"
 "Deseja prosseguir?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Esta média de actualização já 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"
@@ -1703,13 +1491,12 @@ msgstr ""
 "\n"
 "Então, reinicie %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Como escolher o seu mirror manualmente"
 
-#: ../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"
@@ -1723,58 +1510,56 @@ msgstr ""
 "\n"
 "Então, reinicie %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "A inspeccionar %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "alterações:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Remover .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Usar .%s como ficheiro principal"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Não fazer nada"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalação finalizada"
 
-#: ../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 "Todos os pacotes pedidos foram instalados com sucesso."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problema durante a instalação"
 
-#: ../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"
@@ -1784,18 +1569,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Não foi possível transferir os pacotes fonte."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Não foi possível transferir os pacotes fonte, desculpe. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1807,38 +1591,34 @@ msgstr ""
 "Erro(s) comunicados:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalação de pacotes..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "A inicializar..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalação de pacotes..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Mudar média"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor insira a média chamada \"%s\" no dispositivo [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "A transferir o pacote '%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "A verificar as assinaturas dos pacotes..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1852,13 +1632,12 @@ msgstr ""
 "\n"
 "Deseja continuar a instalação?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalação falhada"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1870,23 +1649,21 @@ msgstr ""
 "\n"
 "Talvez queira actualizar a sua base de dados das médias."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "A preparar a instalação dos pacotes..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "A instalar o pacote '%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "não foi possível aceder ao ficheiro rpm [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1898,43 +1675,34 @@ msgstr ""
 "Alguns ficheiros de configuração foram criados como `.rpmnew' ou\n"
 "`.rpmsave', pode agora inspeccionar alguns para assim agir em conformidade:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Estes pacotes vêm com informações de actualização"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Mais informação no pacote... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nenhum pacote encontrado para instalar."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Erro irrecuperável: nenhum pacote encontrado para instalação, desculpe."
-
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
+msgstr ""
+"Erro irrecuperável: nenhum pacote encontrado para instalação, desculpe."
 
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Por favor aguarde, a remover pacotes..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problema durante a remoção"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1944,8 +1712,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1957,8 +1724,8 @@ msgstr ""
 "Esta ferramenta irá ajudá-lo a escolher que software deseja\n"
 "remover do seu computador."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1970,13 +1737,11 @@ msgstr ""
 "Esta ferramenta irá ajudá-lo a escolher que actualizações deseja\n"
 "instalar no seu computador."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Bemvindo à ferramenta de instalação de software!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1990,214 +1755,172 @@ msgstr ""
 "software no CDROM ou DVD. Esta ferramenta irá ajudá-lo a escolher\n"
 "que software deseja instalar no seu computador."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Actualizar Software"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Actualização Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Actualizar Software"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Por favor introduza as suas credenciais para aceder ao proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Utilizador:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Remoção de Pacotes de Software"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Actualização de Pacotes de Software"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalação de Pacotes de Software"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Não"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Sim"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informação..."
 
-#: ../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 "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Suíça"
 
-#: ../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 "Alemanha"
 
-#: ../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 "Espanha"
 
-#: ../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 "Hungria"
 
-#: ../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ão"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Coreia"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: ../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 "Singapura"
 
-#: ../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"
@@ -2209,8 +1932,7 @@ msgstr ""
 "\n"
 "Deseja prosseguir?"
 
-#: ../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,25 +1944,28 @@ msgstr ""
 "\n"
 "Deseja prosseguir?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s escolhas"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Por favor aguarde, a transferir os endereços dos mirrors."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Por favor aguarde, os endereços dos mirrors estão a ser transferidos do "
 "sítio 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 "Erro durante a transferência"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2254,8 +1979,8 @@ msgstr ""
 "A rede, ou o sítio web, podem não estar disponíveis.\n"
 "Por favor tente mais tarde."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2269,18 +1994,15 @@ msgstr ""
 "A rede, ou o servidor da Mandriva, podem não estar disponíveis.\n"
 "Por favor tente mais tarde."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nenhum mirror"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Não foi possível encontrar um mirror adequado."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2294,69 +2016,64 @@ msgstr ""
 "o caso onde a arquitectura do seu processador não é suportada\n"
 "pelas Actualizações Oficiais do Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Por favor escolha o mirror desejado."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "A copiar o ficheiro para a média `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "A examinar o ficheiro da média `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "A examinar o ficheiro remoto da média `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " pronto."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " falhada!"
 
 #. -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 da média %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "A iniciar a transferência de '%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Transferência de `%s', tempo restante: %s, velocidade: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Transferência de `%s', velocidade:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Por favor aguarde, a actualizar a média..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Erro ao transferir os pacotes"
 
-#: ../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"
@@ -2371,35 +2088,31 @@ msgstr ""
 "e voltar a adicionar para a reconfigurar, ou actualmente não se encontra\n"
 "disponível e deve tentar mais tarde."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Actualizar média"
 
-#: ../rpmdrake.pm:722
-#, c-format
-msgid "No active medium found. You must enable some media to be able to update them."
+#: ../rpmdrake.pm:738
+msgid ""
+"No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Nenhuma média activa encontrada. Deve activar algumas médias para assim as "
 "poder actualizar."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Seleccione a média que deseja actualizar:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Seleccionar tudo"
 
-#: ../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"
@@ -2411,8 +2124,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"
@@ -2422,18 +2135,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Não foi possível criar a média."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Falha ao adicionar a média"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2443,8 +2154,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 +2165,8 @@ msgstr ""
 "que está a usar (%s).\n"
 "Irá ser desactivada."
 
-#: ../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,14 +2176,13 @@ msgstr ""
 "Mandriva Linux que está a usar (%s).\n"
 "Irá ser desactivada."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Ajuda executada em 2º plano"
 
-#: ../rpmdrake.pm:853
-#, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
+#: ../rpmdrake.pm:870
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr "A janela de ajuda foi iniciada, deverá aparecer em breve no seu ecrã."
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -2745,3 +2455,14 @@ msgstr "Remover Software"
 msgid "Software Media Manager"
 msgstr "Gestor de Médias de Software"
 
+#~ msgid "Stop"
+#~ msgstr "Parar"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Todos os pacotes, por média de origem"
+
+#~ msgid "Normal information"
+#~ msgstr "Informação normal"
+
+#~ msgid "Maximum information"
+#~ msgstr "Informação completa"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1136a12f..d9bf4e5f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,7 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-pt_BR\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-26 09:22-0300\n"
 "Last-Translator: Arthur R. Mello <renato@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -26,13 +27,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 "Escolha o tipo 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"
@@ -55,18 +54,16 @@ msgstr ""
 "e os que fornecem atualizaçóes oficiais para a sua distribuição. \n"
 "Você pode adicionar ambos, mas terá que fazê-lo em dois passos."
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Fontes de distribuição"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Atualizações 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"
@@ -85,105 +82,85 @@ msgstr ""
 "\n"
 "Deseja continuar?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Aguarde, adicionando fontes..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Adicionar mídia"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Arquivos locais"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Caminho:"
 
-#: ../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 removível"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Caminho ou ponto de montagem:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Dispositivo removível"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Procurar..."
 
-#: ../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 "Senha:"
 
 # Translation needs reworking
-#: ../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 "Caminho relativo para 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 deixado em branco, \"synthesis/hdlist\" será automaticamente usado"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nome:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Criar mídia para toda a distribuição"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Busca esta mídia para atualizações"
 
-#: ../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 "Você precisa preencher pelo menos os dois primeiros campos"
 
-#: ../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?"
@@ -191,13 +168,11 @@ msgstr ""
 "Já existe uma mídia com este nome, você\n"
 "realmente quer substituir?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Adicionando uma mídia:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tipo de mídia:"
 
@@ -205,10 +180,9 @@ msgstr "Tipo 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 "Cancelar"
 
@@ -217,101 +191,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 "Ok"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Opções gerais para instalação de pacotes"
 
 #: ../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 pacotes RPMs que serão instalados"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Software de download a ser utilizado:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Remoção de Fonte"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Tem certeza que quer remover a fonte\" %s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Aguarde, removendo mídia..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Editar mídia"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Editando mídia \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Salvar alterações"
 
-#: ../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 "Você precisa inserir a mídia 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 salvar as alterações, você precisa inserir a mídia no drive."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Configurar proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Configuração proxy para a mídia \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Configuração Global 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]>):"
@@ -320,139 +279,113 @@ msgstr ""
 "<servidorproxy[:porta]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Servidor proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Você pode especificar um usuário e senha para autenticação no proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Usuário:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Adicionar um grupo paralelo"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Editar o grupo paralelo"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Adicionar limite na mídia"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Escolha a mídia para adicionar limite:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Adicionar um host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Digite o nome do host ou endereço IP que deseja adicionar:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editando o grupo paralelo \"%s\":"
 
 #: ../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 "Limite da mídia:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Adicionar"
 
 #: ../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 "Remover"
 
 #: ../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 o urpmi paralelo (execução distribuída do 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 "Limite da Mídia"
 
+#: ../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 "(nenhum)"
 
-#: ../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 "Adicionar..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Gerencia chaves para assinatura digital dos pacotes"
 
-#: ../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"
@@ -461,27 +394,24 @@ msgstr ""
 "Chaves"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "nome não encontrado, chave não existe na lista de chaves do rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Adicionar chave"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Escolha a chave para adicionar a mídia %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Remover chave"
 
 #: ../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,38 +420,32 @@ msgstr ""
 "(nome da chave: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Adicionar chave..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Remover chave"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Configurar mídia"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Habilitar?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Atualizar?"
 
-#: ../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 ""
 "Esta mídia precisa ser atualizada para ser utilizada. Atualizar agora ?"
 
-#: ../edit-urpm-sources.pl:940
-#, c-format
+#: ../edit-urpm-sources.pl:954
+#, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -531,38 +455,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Adicionar..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Atualizar..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Gerenciar chaves..."
 
-#: ../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 "Opções globais..."
 
-#: ../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"
@@ -572,8 +490,7 @@ msgstr ""
 "\n"
 "Está pronto para continuar?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -587,8 +504,7 @@ msgstr ""
 "seu computador. Elas disponibilizarão novos pacotes de softwares para\n"
 "instalação ou para atualização."
 
-#: ../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"
@@ -600,13 +516,23 @@ msgstr ""
 "(um outro genrenciador em um outro desktop, ou você já está \n"
 "instalando algum pacote)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Não é possível adicionar mídia, argumentos errados ou esquecidos"
 
-#: ../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 ""
+"Você está pronto para adicionar pacotes novos da mídia, '%s'.\n"
+"Isso significa que você poderá adicionar novos pacotes de software's\n"
+"no seu sistema a partir dessa nova 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"
@@ -616,18 +542,22 @@ msgstr ""
 "Isso significa que você poderá adicionar novos pacotes de software's\n"
 "no seu sistema a partir dessa nova mídia."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Mídia '%s' adicionada com sucesso."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Mídia '%s' adicionada com sucesso."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Uso: %s [OPÇÕES]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -635,45 +565,38 @@ msgstr ""
 "  --changelog-first      mostra o changelog antes da lista de arquivos na "
 "janela de descrição"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     limita somente a mídia especificada"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     fundir todas os arquivos .rpmnew/.rpmsave não "
 "encontrados"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            habilita o modo (install (padrão), remove, update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      não pergunta primeiro a confirmação no modo de "
 "atualização."
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      não atualizar mídia ao iniciar"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        não verifica assinatura de pacotes"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -681,33 +604,27 @@ msgstr ""
 "  --parallel=alias,host  ficar em modo paralelo, use grupo \"alias\",e use "
 "máquina \"host\" para mostrar as dependências necessárias"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    mostrar somente estes pacotes"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      pré-seleciona estes pacotes"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 força rodar como root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           fazer pesquisa por \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Executando em modo usuário"
 
-#: ../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"
@@ -717,634 +634,517 @@ msgstr ""
 "Você não irá poder fazer alterações nesse sistema,\n"
 "mas você poderá navegar pela base de dados existente."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Acessibilidade"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arquivar"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Gravar CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compressão"
 
-#: ../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 "Outro"
 
-#: ../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 "Livros"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Livros de Informática"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Perguntas Freqüentes"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Como fazer"
 
-#: ../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 "Mensagem Passou "
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Enfileirar Serviços"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Comunicações"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Banco de Dados"
 
-#: ../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 "Desenvolvimento"
-
-#: ../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 "Desenvolvimento"
+
+#: ../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 "Educação"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emuladores"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Ferramentas de arquivos"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Jogos"
-
-#: ../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 "Jogos"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Tabuleiros"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cartas"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzzles"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Esportes"
 
-#: ../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 "Ambiente 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 "Ambiente Gráfico"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Baseado em FVWN"
 
-#: ../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 "Monitorando"
 
-#: ../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 "Rede"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Conversação"
 
-#: ../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 "Transferência de Arquivos"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Mensagens Instantâneas"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Correio"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Notícias"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Acesso Remoto"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Escritório"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Chave Pública"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publicando"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Ciências"
-
-#: ../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ências"
+
+#: ../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ência da computação"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geociências"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matemática"
 
-#: ../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 "Som"
 
-#: ../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 "Configurações"
+#: ../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 "Boot e Início"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configurações"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Empacotando"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Impressão"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Desenvolvimento"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Desenvolvimento"
 
-#: ../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 "Internacionalização"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel e 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 "Terminais"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Ferramentas em modo texto"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Brinquedos"
 
-#: ../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 "(Indisponível)"
 
-#: ../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 (nenhum)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Aguarde, procurando..."
 
-#: ../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 "Instalável"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Atualizável"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Instalável"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Não selecionado"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Selecionado"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Não selecionado"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importância: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Razão para atualização:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Sem descrição"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Arquivos:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Histórico de atualizações:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Mídia: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versão instalada atualmente: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versão: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arquitetura: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Tamanho: "
-
-#: ../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 "Tamanho: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Resumo: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Razão para atualização:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Descrição: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Sem descrição"
+#. 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 "Mais informações no pacote..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Por favor escolha"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Um dos seguintes pacotes é necessário"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Por favor escolha"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Aguarde, listando pacotes..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Sem atualização"
 
-#: ../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"
@@ -1354,29 +1154,24 @@ msgstr ""
 "atualização disponível para os pacotes instalados em seu computador,\n"
 "ou você já atualizou todos."
 
-#: ../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 "Mais informações"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informação sobre os pacotes"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Alguns pacotes adicionais precisam ser removidos"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1386,13 +1181,11 @@ msgstr ""
 "precisa(m) ser removido(s):\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Alguns pacotes não podem ser removidos"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1400,8 +1193,7 @@ msgstr ""
 "A remoção desses pacotes estragaria o seu sistema, desculpe:\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"
@@ -1411,13 +1203,11 @@ msgstr ""
 "ser desselecionados agora:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Pacotes adicionais são necessários"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1427,18 +1217,17 @@ msgstr ""
 "ser instalado(s):\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (pertence à lista de ignorados )"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Alguns pacotes não podem ser instalados"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1448,123 +1237,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Alguns pacotes precisam ser removidos"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selecionado: %d MB / Espaço disponível: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Tamanho selecionado: %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 "Descrição nao disponível para este pacote\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Atualizações de segurança"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Atualizações para correção de erros"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instalar"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Atualizações normais"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instalar"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s escolhas"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Recomendação do 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 os pacotes, alfabeticamente"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Todos os pacotes, por grupo"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Todos pacotes, por disponibilidade de atualização"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Todos os pacotes, por tamanho"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Todos os pacotes, por estado de seleção"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Todos os pacotes, por repositório de mídia"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Todos pacotes, por disponibilidade de atualização"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Somente os existentes, classificado pela data de instalação"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Todos os pacotes, por grupo"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Atualizações normais"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Atualizações para correção de erros"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Atualizações normais"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Atualizações de segurança"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "nos nomes"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "nas descrições"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "nos arquivos"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informações normais"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Informação máxima"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Você precisa selecionar alguns pacotes primeiro."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Pacotes demais foram selecionados"
 
 #: ../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"
@@ -1581,7 +1355,7 @@ msgstr ""
 "Você realmente quer instalar todos os pacotes selecionados?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1595,89 +1369,100 @@ msgstr ""
 "\n"
 "Deseja 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 "/_Arquivo"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Atualizar mídia"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Reiniciando a seleção"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Recarregar a lista de _pacotes"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Encerrar"
 
-#: ../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ções"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Mostra automaticamente os pacotes _selecionados"
 
-#: ../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 "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 "Localizar:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Procurar"
 
-#: ../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 "Sair"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Erro fatal"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Ocorreu um erro 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"
@@ -1689,13 +1474,12 @@ msgstr ""
 "\n"
 "Deseja continuar?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Mídia de atualização já 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"
@@ -1711,13 +1495,12 @@ msgstr ""
 "\n"
 "Após isso, reinicie o %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Como selecionar manualmente o seu servidor espelho"
 
-#: ../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"
@@ -1731,59 +1514,57 @@ msgstr ""
 "\n"
 "Após isso, reinicie o %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Aguarde, procurando pacotes disponíveis..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Aguarde, lendo banco de dados de pacotes..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Verificando %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "mudanças:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Remover .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Utilize .%s como arquivo principal"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Não fazer nada"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalação concluída"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Verificando..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Todos os pacotes requisitados foram instalados com sucesso."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problemas ocorreram durante a instalação"
 
 # c-format
-#: ../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"
@@ -1793,18 +1574,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Não foi possível obter fontes de pacotes."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Impossível pegar os fontes dos pacotes, desculpe. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1816,38 +1596,34 @@ msgstr ""
 "Erro(s) reportados:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalação do pacote..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicializando..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalação do pacote..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Alterando mídia"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Por favor insira a mídia com nome \"%s\" no drive [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Fazendo download do pacote `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Verificando assinatura dos pacotes..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1861,13 +1637,12 @@ msgstr ""
 "\n"
 "Deseja continuar com a instalação?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalação falhou"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1879,23 +1654,21 @@ msgstr ""
 "\n"
 "Você precisa atualizar a sua lista de mídias."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Preparando pacotes para instalação..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando pacote `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "incapaz de acessar o arquivo rpm [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1907,44 +1680,34 @@ msgstr ""
 "Alguns arquivos de configuração foram criados como `.rpmnew' ou `.rpmsave',\n"
 "você poderá verificá-los agora para tomar eventuais ações:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Estes pacotes vêm com informação da atualização"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Mais informações do pacote... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nenhum pacote encontrado para instalação."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Erro: Nenhum pacote encontrado para instalação, desculpe."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Aguarde, lendo banco de dados de pacotes..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Aguarde, removendo pacotes..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problema durante a remoção"
 
 # c-format
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1954,8 +1717,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1967,8 +1729,8 @@ msgstr ""
 "Esse assistente ajudará você a escolher quais pacotes deseja remover\n"
 "do seu computador."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1979,13 +1741,11 @@ msgstr ""
 "\n"
 "Esta ferramenta irá ajudar na atualização do seu sistema."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Bem vindo a ferramenta de instalação de software!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1999,214 +1759,172 @@ msgstr ""
 "no DVD. Esse assistente ajudará você na escolha de softwares que\n"
 "deseja instalar no seu computador."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Gerenciador de Atualizações."
-
-#: ../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 "Gerenciador de Atualizações."
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Favor entrar com suas credenciais para acesso ao proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Nome do usuário:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Remoção de Pacotes de Softwares"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Atualização de Pacotes de Softwares"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalação de Pacotes de Software"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Não"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Sim"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informação..."
 
-#: ../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íça"
 
-#: ../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 "Alemanha"
 
-#: ../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 "Espanha"
 
-#: ../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 "Hungria"
 
-#: ../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ão"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Coréia"
 
-#: ../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 "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 "Singapura"
 
-#: ../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 "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"
@@ -2219,8 +1937,7 @@ msgstr ""
 "\n"
 "Deseja 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,23 +1949,26 @@ msgstr ""
 "\n"
 "Deseja continuar?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s escolhas"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Aguarde, fazendo download da lista de servidores."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Aguarde, fazendo download da lista de servidores do site da 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 o download"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2263,8 +1983,8 @@ msgstr ""
 "indisponíveis.\n"
 "Por favor tente mais tarde."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2279,18 +1999,15 @@ msgstr ""
 "indisponíveis no momento.\n"
 "Por favor tente mais tarde."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nenhum servidor"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Não foi possível encontrar o espelho"
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2304,69 +2021,64 @@ msgstr ""
 "que a arquitetura do processador do seu computador não é suportada\n"
 "pelas Atualizaçães Oficiais do Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Escolha o servidor desejado."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copiando arquivo da mídia '%s' ... "
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinando arquivo da mídia '%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinando arquivo remoto da mídia '%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " pronto."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " falhou!"
 
 #. -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 da mídia %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Iniciando download de `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download de '%s', tempo para terminar: '%s', velocidade: '%s'"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download de '%s', velocidade: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Aguarde, atualizando fonte..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Erro ao recuperar pacotes"
 
-#: ../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"
@@ -2382,36 +2094,31 @@ msgstr ""
 "para reconfigurá-la, ou você deve tentar novamente\n"
 "depois."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Atualizar mídia"
 
-#: ../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 ""
 "Nenhuma mídia ativa encontrada. Você deve habilitar alguma mídia para poder "
 "atualizá-la."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Escolha a(s) mídia(s) que deseja atualizar:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Selecionar tudo"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Atualizar"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2423,8 +2130,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"
@@ -2434,19 +2141,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Incapaz de criar a mídia."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Falhou enquanto adicionava mídia"
 
 # c-format
-#: ../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 ""
 "está usando no momento (%s).\n"
 " Ela será desativada."
 
-#: ../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 ""
 "Linux que você está usando no momento (%s).\n"
 " ela será desativada."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Ajuda iniciada em 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 "A janela de ajuda foi iniciada, deve aparecer logo em seu desktop."
@@ -2763,6 +2466,18 @@ msgstr "Remover software"
 msgid "Software Media Manager"
 msgstr "Gerenciador de Mídia de Software"
 
+#~ msgid "Stop"
+#~ msgstr "Parar"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Todos os pacotes, por repositório de mídia"
+
+#~ msgid "Normal information"
+#~ msgstr "Informações normais"
+
+#~ msgid "Maximum information"
+#~ msgstr "Informação máxima"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "tudo foi instalado corretamente"
 
diff --git a/po/ro.po b/po/ro.po
index 1b4706ec..885aef53 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -17,7 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ro\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-09 15:39+0300\n"
 "Last-Translator: Ovidiu Constantin <ovidiusoft@gmail.com>\n"
 "Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -27,13 +28,11 @@ msgstr ""
 "sourceforge.net>\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"
@@ -47,18 +46,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 "Actualizări normale"
 
-#: ../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"
@@ -74,104 +72,87 @@ msgstr ""
 "\n"
 "Pot să continui?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Vă rog să aşteptaţi, actualizez mediul..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Adaugă un mediu"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Fişiere locale"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Cale:"
 
-#: ../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 "Dispozitiv detaşabil"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Calea sau punctul de montare:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Dispozitiv detaşabil"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Răsfoieşte..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Logare:"
 
-#: ../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 "Parola:"
 
-#: ../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 "Calea relativă la synthesis sau hdlist:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Dacă este lăsat gol, synthesis/hdlist vor fi căutate automat"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nume:"
 
 #: ../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 "Selectaţi mediile de actualizat:"
 
-#: ../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 "Trebuie să completaţi cel puţin primele două intrări."
 
-#: ../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 +160,11 @@ msgstr ""
 "Există deja un mediu cu acel nume,\n"
 "chiar doriţi să îl înlocuiţi?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Adaug un mediu:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tipul mediului:"
 
@@ -193,10 +172,9 @@ msgstr "Tipul mediului:"
 #: ../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 "Renunţă"
 
@@ -205,101 +183,89 @@ msgstr "Renunţă"
 #: ../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 "Pregătesc pachetele pentru instalare..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "zero"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Unele pachete nu pot fi instalate"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Descarc `%s', viteză: %s"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Ştergere surse"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Sunteţi sigur că doriţi să eliminaţi sursa \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Vă rog să aşteptaţi, şterg mediul..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Editare mediu"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Editez mediul \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Salvează schimbările"
 
-#: ../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 "Trebuie să introduceţi mediul pentru a continua"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Pentru a salva modificările, trebuie să introduceţi mediul în unitate."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Configurare proxy-uri"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Configurare proxy pentru mediul \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Configurări globale proxy"
 
 #: ../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 +274,137 @@ msgstr ""
 "(sintaxă: <gazdăproxy[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Nume gazdă proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Puteţi specifica un utilizator/parolă pentru autentificarea la proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Utilizator:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Adaugă un grup paralel"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Editează un grup paralel"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Adaugă o limită pt. mediu"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Selectaţi un mediu pentru adăugare la limita mediilor:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Adaugă o gazdă"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Introduceţi numele sau adresa IP a gazdei ce va fi adăugată:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editez grupul paralel \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nume grup:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Limite mediu:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Adăugare"
 
 #: ../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 "Şterge"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Gazde:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configurare urpmi paralel (execuţie distribuită a 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 "Limite mediu"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Comandă"
 
-#: ../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 "(nimic)"
 
-#: ../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 "Editare..."
 
-#: ../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 "Adaugă..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Administrare chei pentru semnarea digitală a pachetelor"
 
-#: ../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 "Mediu"
 
 #: ../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 "nu a fost găsit numele, cheia nu există în inelul de key rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Adaugă o cheie"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Alegeţi o cheie ce va fi adăugată mediului %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Elimină o cheie"
 
 #: ../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 +413,32 @@ msgstr ""
 "(numele cheii: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Adaugă o cheie..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Elimină o cheie"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Configurare medii"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Activat?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Actualizare"
 
-#: ../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 +448,34 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "Adaugă..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Actualizează..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Administrare chei..."
 
-#: ../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 "Configurări globale proxy"
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Ajutor"
 
-#: ../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 +485,7 @@ msgstr ""
 "\n"
 "Pot continua?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -574,8 +501,7 @@ msgstr ""
 "pentru \n"
 "instalare de soft nou sau actualizare."
 
-#: ../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"
@@ -587,13 +513,23 @@ msgstr ""
 "pachete pe alt desktop, sau instalaţi alte pachete în acelaşi\n"
 "timp?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Nu pot adăuga mediul, argumente greşite sau lipsă"
 
-#: ../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 ""
+"Sunteţi pe cale să adăugaţi un nou mediu de pachete, `%s'.\n"
+"Aceasta înseamnă că veţi putea adăuga de pe acest mediu\n"
+" pachete cu program la sistemul dvs."
+
+#: ../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"
@@ -603,89 +539,80 @@ msgstr ""
 "Aceasta înseamnă că veţi putea adăuga de pe acest mediu\n"
 " pachete cu program la sistemul dvs."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Mediul `%s' a fost adăugat cu succes."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Mediul `%s' a fost adăugat cu succes."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Utilizare: %s [OPŢIUNI]..."
 
-#: ../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 "Execuţie în mod utilizator"
 
-#: ../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"
@@ -695,634 +622,517 @@ msgstr ""
 "Nu veţi putea modifica sistemul, dar veţi putea\n"
 "naviga prin baza de date existentă."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Accesibilitate"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arhivare"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Copii de siguranță"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Gravare de Cd-uri"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Comprimare"
 
-#: ../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 "Diverse"
 
-#: ../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 "Cărţi"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Carţi despre calculatoare"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Întrebări frecvente -FAQ's"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Cum să fac (HowTo)"
 
-#: ../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 "Schimb de mesaje"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Servicii de punere în coadă"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Telecomunicaţii"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Baze de date"
 
-#: ../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 "Dezvoltare"
-
-#: ../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 "Dezvoltare"
+
+#: ../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 "Nucleu"
 
-#: ../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 "Editoare"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Educaţie"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatoare"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Unelte fișiere"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Jocuri"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Aventură"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Jocuri"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Jocuri de acţiune"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Table"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cărţi de joc"
 
-#: ../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 "Ecran 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 "Ecran grafic"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Bazat pe 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 "Grafică"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitorizare"
 
-#: ../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 "Reţea"
-
-#: ../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 "Reţea"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transfer fişiere"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Mesagerie instantanee"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Poştă"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Ştiri"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Acces la distanţă"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Birou"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Chei publice"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publicare"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Științe"
-
-#: ../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 "Științe"
+
+#: ../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 "Informatică"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Ştiinţe geo"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematică"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fizică"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Interpretoare"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Sunet"
 
-#: ../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 "Bază"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Configurare"
+#: ../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 "Pornire și Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Configurare"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Echipamente"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Împachetare"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Imprimare"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Instalare"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Instalare"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fonturi"
-
-#: ../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 "Fonturi"
+
+#: ../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 "Internaţionalizare"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Nucleu şi echipamente"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Biblioteci"
 
-#: ../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 "Terminale"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Unelte text"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Jucării"
 
-#: ../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 "(Indisponibil)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Rezultatele căutării"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Rezultatele căutării (nimic)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Vă rog să aşteptaţi, caut..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Opreşte"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Disponibile pt. adăugare"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Actualizabile"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Disponibile pt. adăugare"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Deselectat"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Selectate"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Deselectat"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importanţă: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Motivul actualizării:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Nici o descriere"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fişiere:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Jurnal schimbări:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Mediu:"
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versiunea instalată curent:"
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nume: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versiune: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Mărime: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Importanţă: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Mărime: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Sumar: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Motivul actualizării:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Descriere:"
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Nici o descriere"
+#. 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 "Mai multe informaţii despre pachet..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Vă rog să alegeţi"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Este necesar unul din următoarele pachete:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Vă rog să alegeţi"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Vă rog să aşteptaţi, listez pachetele..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Nu sunt actualizări"
 
-#: ../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"
@@ -1332,29 +1142,24 @@ msgstr ""
 "actualizări disponibile pentru pachetele instalate pe calculatorul dvs.,\n"
 "sau că le-aţi instalat deja pe toate."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Toate"
 
 #. -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 "Mai multe informaţii"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informaţii despre pachete"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Trebuie şterse unele pachete adiţionale"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1364,13 +1169,11 @@ msgstr ""
 "următoarele pachete trebuie de asemenea şterse:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Unele pachete nu pot fi şterse"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1378,8 +1181,7 @@ msgstr ""
 "Ştergerea acestor pachete ar corupe sistemul, îmi pare rău:\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"
@@ -1389,13 +1191,11 @@ msgstr ""
 "deselectate acum:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Pachete adiţionale necesare"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1405,18 +1205,17 @@ msgstr ""
 "trebuie de asemenea instalate\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (este în lista de excluderi)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Unele pachete nu pot fi instalate"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1426,123 +1225,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Unele pachete trebuie şterse"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selectat: %d MB / Spaţiu liber pe disc: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Mărime selecţie: %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 "Descrierea nu este disponibilă pentru acest pachet\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Actualizări ale sistemului de securitate"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Actualizări pentru corectarea erorilor"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instalează"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Actualizări normale"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instalează"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Opţiuni 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 "Toate pachetele, alfabetic"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Toate pachetele, după grup"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Toate pachetele, după disponibilitatea actualizării"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Toate pachetele, după mărime"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Toate pachetele, după starea selecţiei"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Toate pachetele, după mediul sursă"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Toate pachetele, după disponibilitatea actualizării"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Numai ramuri, după data instalării"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Toate pachetele, după grup"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Actualizări normale"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Actualizări pentru corectarea erorilor"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Actualizări normale"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Actualizări ale sistemului de securitate"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "în nume"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "în descrieri"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "în numele fişierelor"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informaţii normale"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Informaţii maximale"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Întâi selectaţi nişte pachete."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Sunt selectate prea multe pachete"
 
 #: ../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"
@@ -1559,7 +1343,7 @@ msgstr ""
 "Chiar doriţi să instalaţi pachetele selectate?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1573,89 +1357,100 @@ msgstr ""
 "\n"
 "Doriţi să continuaţi? "
 
-#: ../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 "/_Fişier"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Actualizare medii"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Resetează selecţia"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Reîncarcă lista _pachetelor"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Terminare"
 
-#: ../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ţiuni"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Arată pachetele selectate automat"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: ../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 "Actualizare 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 "Caută:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Căutare"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Şterge"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instalează"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Ieşire"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Eroare fatală"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "A apărut o eroare 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"
@@ -1668,13 +1463,12 @@ msgstr ""
 "\n"
 "Doriţi să continuaţi?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Mediu de actualizare preexistent"
 
-#: ../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"
@@ -1690,13 +1484,12 @@ msgstr ""
 "\n"
 "Apoi reporniţi %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Cum să selectaţi manual serverul oglindă"
 
-#: ../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"
@@ -1710,58 +1503,56 @@ msgstr ""
 "\n"
 "Apoi reporniţi %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Vă rog să aşteptaţi, caut pachetele disponibile..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Vă rog să aşteptaţi, citesc baza de date a pachetelelor..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Inspectez %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "schimbări:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Şterg .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Foloseşte .%s ca fişier principal"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Nu fă nimic"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalare terminată"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Inspectez..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Toate pachetele cerute au fost instalate cu succes."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Probleme apărute în timpul instalării"
 
-#: ../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"
@@ -1771,18 +1562,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Nu pot prelua pachetele sursă."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Nu pot prelua pachetele sursă, regret. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1794,38 +1584,34 @@ msgstr ""
 "Eroare(erori) raportată(e):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalare pachete..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Iniţializez..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalare pachete..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Schimbă mediul"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vă rog să introduceţi mediul numit \"%s\" în dispozitivul [%s] "
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Descarc pachetul `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Verific semnăturile pachetelor..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1839,13 +1625,12 @@ msgstr ""
 "\n"
 "Doriţi să continuaţi?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalare eşuată"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1857,23 +1642,22 @@ msgstr ""
 "\n"
 "Probabil ar trebui să actualizaţi baza de date a mediilor sursă."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Pregătesc pachetele pentru instalare..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalez pachetul `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "nu pot accesa fişierul rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1885,43 +1669,33 @@ msgstr ""
 "Unele fişiere de configurare au fost create ca `.rpmnew' sau `.rpmsave',\n"
 "le puteţi inspecta acum pentru a decide acţiunile ulterioare:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Aceste pachete conţin informaţii de actualizare"
 
-#: ../rpmdrake:1722
-#, fuzzy, c-format
+#: ../rpmdrake:1819
+#, fuzzy, perl-format
 msgid "More information on package... [%s]"
 msgstr "Mai multe informaţii despre pachet..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nu am gasit nici un pachet de instalat."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Eroare, nu am găsit nici un pachet pt. instalare, regret."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Vă rog să aşteptaţi, citesc baza de date a pachetelelor..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Vă rog să aşteptaţi, şterg pachetele..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problemă în timpul ştergerii"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1931,8 +1705,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1944,8 +1717,8 @@ msgstr ""
 "Acest utilitar vă va ajuta să alegeţi programele pe care doriţi \n"
 "să le ştergeţi de pe calculatorul dvs."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1958,13 +1731,11 @@ msgstr ""
 "care doriţi \n"
 "să le actualizaţi ."
 
-#: ../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"
@@ -1979,214 +1750,176 @@ msgstr ""
 "Acest utilitar vă va ajuta să alegeţi programele pe care doriţi \n"
 "să le instalaţi pe calculatorul dvs."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Actualizare pachete software"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Actualizare Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Actualizare pachete software"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Vă rog să introduceţi mai jos adresa dvs. de email "
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Nume:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Ştergere pachete Software"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Actualizare pachete software"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalare pachete cu programe..."
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nu"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informaţii... "
 
-#: ../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 "Belgia"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazilia"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Elveţia"
 
-#: ../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 "Cehia"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Germania"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danemarca"
 
-#: ../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 "Spania"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlanda"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Franţa"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ungaria"
 
-#: ../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 "Coreea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Olanda"
 
-#: ../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 "Portugalia"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovacia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Marea Britanie"
 
-#: ../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 "Statele Unite"
 
-#: ../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"
@@ -2199,8 +1932,7 @@ msgstr ""
 "\n"
 "Pot să continui?"
 
-#: ../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,27 +1945,30 @@ msgstr ""
 "\n"
 "Pot să continui?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Vă rog să aşteptaţi, descarc adresele serverelor oglindă de pe situl "
 "Mandriva."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Vă rog să aşteptaţi, descarc adresele serverelor oglindă de pe situl "
 "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 "Eroare în timpul descărcării."
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2247,8 +1982,8 @@ msgstr ""
 "Probabil reţeaua sau situl Web al Mandriva nu sunt disponibile.\n"
 "Vă rog să încercaţi din nou mai târziu."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2262,18 +1997,15 @@ msgstr ""
 "Probabil reţeaua sau situl Web al Mandriva nu sunt disponibile.\n"
 "Vă rog să încercaţi din nou mai târziu."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nu există servere oglindă"
 
-#: ../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"
@@ -2287,69 +2019,64 @@ msgstr ""
 "cazul când arhitectura procesorului dvs. nu este suportată\n"
 "de actualizările oficiale Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Vă rog să selectaţi serverul oglindă dorit."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copiez fişierul pentru mediul `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinez fişierul pentru mediul `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinez fişierul la distanţă pentru mediul `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " terminat."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " Eşec!"
 
 #. -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 pe mediul %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Pornesc descărcarea pt: `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Descarc `%s', timp rămas: %s, viteză: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Descarc `%s', viteză: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Vă rog să aşteptaţi, actualizez mediul..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Eroare la aducerea pachetelor"
 
-#: ../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"
@@ -2366,34 +2093,30 @@ msgstr ""
 "iarăsi\n"
 "mai târziu."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Actualizare mediu"
 
-#: ../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 "Selectaţi mediile de actualizat:"
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr "Selectate"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Actualizare"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2405,8 +2128,8 @@ msgstr ""
 "Erori:\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"
@@ -2416,18 +2139,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Nu pot creea mediul."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Adăugare mediu eşuată"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2437,8 +2158,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"
@@ -2448,8 +2169,8 @@ msgstr ""
 "versiunea de Mandriva Linux pe care o rulaţi (%s).\n"
 "Va fi dezactivat."
 
-#: ../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"
@@ -2459,13 +2180,11 @@ msgstr ""
 "versiunea de Mandriva Linux pe care o rulaţi (%s).\n"
 "Va fi dezactivat."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Ajutorul a fost lansat în fundal"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "Fereastra de ajutor a fost pornită, va apare în scurt timp pe ecran."
@@ -2740,6 +2459,18 @@ msgstr "Ştergere programe"
 msgid "Software Media Manager"
 msgstr "Administrator surse de programe"
 
+#~ msgid "Stop"
+#~ msgstr "Opreşte"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Toate pachetele, după mediul sursă"
+
+#~ msgid "Normal information"
+#~ msgstr "Informaţii normale"
+
+#~ msgid "Maximum information"
+#~ msgstr "Informaţii maximale"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "Totul a fost instalat cu succes"
 
diff --git a/po/rpmdrake.pot b/po/rpmdrake.pot
index cc6c5f54..5925b34d 100644
--- a/po/rpmdrake.pot
+++ b/po/rpmdrake.pot
@@ -1,26 +1,26 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"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 +34,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"
@@ -56,116 +54,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 ""
 
-#: ../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
-#, c-format
+#: ../edit-urpm-sources.pl:134
 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"
+#: ../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 ""
 
@@ -173,10 +149,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 +160,293 @@ 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
-#, 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"
 "%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"
@@ -537,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"
@@ -546,939 +463,791 @@ 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 ""
 
-#: ../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"
+#: ../rpmdrake:212
+msgid "C"
 msgstr ""
 
-#: ../rpmdrake:202
-#, c-format
-msgid "C"
+#: ../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:203
-#, c-format
+#: ../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"
+#: ../rpmdrake:227
+msgid "Adventure"
 msgstr ""
 
-#: ../rpmdrake:216
-#, c-format
-msgid "Adventure"
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
 msgstr ""
 
-#: ../rpmdrake:217
-#, c-format
+#: ../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 ""
 
-#: ../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"
+#: ../rpmdrake:246
+msgid "Chat"
 msgstr ""
 
-#: ../rpmdrake:235
-#, c-format
-msgid "Chat"
+#: ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:254 ../rpmdrake:271
+msgid "Networking"
 msgstr ""
 
-#: ../rpmdrake:236
-#, c-format
+#: ../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"
+#: ../rpmdrake:258
+msgid "Astronomy"
 msgstr ""
 
-#: ../rpmdrake:247
-#, c-format
-msgid "Astronomy"
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:248
-#, c-format
+#: ../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"
+#: ../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"
+#: ../rpmdrake:277
+msgid "Console"
 msgstr ""
 
-#: ../rpmdrake:266
-#, c-format
-msgid "Console"
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
 msgstr ""
 
-#: ../rpmdrake:267
-#, c-format
+#: ../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"
-msgstr ""
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
+#: ../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"
+#: ../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: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 ""
 
-#: ../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 ""
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
+#: ../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"
+#. 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"
+#: ../rpmdrake:1003
+msgid "Installed"
 msgstr ""
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
+#: ../rpmdrake:1003
+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
+msgid "All updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
-msgid "in names"
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1059
-#, c-format
-msgid "in descriptions"
+#: ../rpmdrake:1013
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:1061
-#, c-format
-msgid "in file names"
+#: ../rpmdrake:1013
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
+#: ../rpmdrake:1068
+msgid "in names"
 msgstr ""
 
 #: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
+msgid "in descriptions"
+msgstr ""
+
+#: ../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"
@@ -1489,7 +1258,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,89 +1267,99 @@ 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
-#, 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 ""
 
-#: ../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
+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"
+#: ../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"
@@ -1588,13 +1367,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"
@@ -1604,13 +1382,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"
@@ -1619,76 +1396,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"
@@ -1696,38 +1470,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"
@@ -1736,13 +1506,12 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../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"
@@ -1750,23 +1519,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"
@@ -1774,51 +1541,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"
@@ -1826,8 +1582,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1835,13 +1591,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"
@@ -1850,214 +1604,172 @@ 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
-#, c-format
+#: ../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 ""
 
-#: ../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"
@@ -2065,8 +1777,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"
@@ -2074,23 +1785,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"
@@ -2099,8 +1812,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"
@@ -2109,18 +1822,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"
@@ -2129,69 +1839,64 @@ 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
-#, 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"
@@ -2201,34 +1906,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"
@@ -2236,55 +1936,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 ""
diff --git a/po/ru.po b/po/ru.po
index 352145b3..9534df5c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,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-12-21 12:40+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <docteam@lafox.net>\n"
@@ -20,13 +21,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 "Выберите тип источника"
 
-#: ../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 ""
 "добавить\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"
@@ -81,105 +78,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
-#, 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
-#, 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?"
@@ -187,13 +164,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 +176,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,101 +187,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 "Проверять устанавливаемые 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 "Настройки proxy для носителя \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Общие настройки proxy"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -316,166 +275,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 keyring!"
 
 #: ../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)"
@@ -484,39 +414,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"
@@ -526,38 +450,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"
@@ -567,8 +485,7 @@ msgstr ""
 "\n"
 "Всё в порядке? Можно продолжать?"
 
-#: ../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 ""
 "они будут доступны для установки пакетов новых программ или\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"
@@ -596,13 +512,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"
@@ -612,18 +538,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"
@@ -631,45 +561,38 @@ msgstr ""
 "  --changelog-first      показать журнал изменений перед списком файлов в "
 "окне с описанием"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=источник1,..   ограничиться указанными источниками"
 
-#: ../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=РЕЖИМ           выбор режима (install (по умолчанию), remove, "
 "update)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      не выводить первый запрос на подтверждение в режиме "
 "update"
 
-#: ../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"
@@ -677,33 +600,27 @@ msgstr ""
 "  --parallel=алиас,хост  параллельный режим; используйте группу \"алиас\", "
 "используйте машину\"хост\", чтобы увидеть необходимые зависимости"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=пкт1,..    показать только эти пакеты"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=пакет1,..    заранее выбрать эти пакеты"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 принудительный запуск под root'ом"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=пакет         запустить поиска \"пакета\""
 
-#: ../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"
@@ -713,634 +630,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 "Запись 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 "HOWTO"
 
-#: ../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 "Аркады"
 
-#: ../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 "Командные процессоры (Shells)"
 
-#: ../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 "Changelog:\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"
@@ -1350,29 +1150,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"
@@ -1381,13 +1176,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"
@@ -1395,8 +1188,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"
@@ -1406,13 +1198,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"
@@ -1422,18 +1212,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"
@@ -1443,123 +1232,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 "Выбор 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 "Только остатки, отсортированные по дате установки"
 
-#: ../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"
@@ -1576,7 +1350,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 +1364,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"
@@ -1685,13 +1470,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"
@@ -1708,13 +1492,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"
@@ -1728,58 +1511,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"
@@ -1789,18 +1570,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 +1592,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 +1633,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 +1650,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"
@@ -1903,43 +1676,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"
@@ -1949,8 +1712,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1962,8 +1724,8 @@ msgstr ""
 "Эта утилита поможет вам выбрать пакеты для удаления с вашего\n"
 "компьютера."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1975,13 +1737,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"
@@ -1995,214 +1755,172 @@ 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 "Обновление 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"
@@ -2214,8 +1932,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"
@@ -2227,25 +1944,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 ""
 "Пожалуйста, подождите, загружаются адреса зеркал с веб-сайта\n"
 "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"
@@ -2259,8 +1979,8 @@ msgstr ""
 "Возможно, недоступны сеть или веб-сайт.\n"
 "Пожалуйста, попробуйте ещё раз чуть позже."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2274,18 +1994,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"
@@ -2299,69 +2016,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"
@@ -2376,36 +2088,31 @@ 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"
@@ -2417,8 +2124,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"
@@ -2428,18 +2135,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"
@@ -2449,8 +2154,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"
@@ -2460,8 +2165,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"
@@ -2471,13 +2176,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 ""
@@ -2755,6 +2458,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/sc.po b/po/sc.po
index 0c0355b2..c72f1f84 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sc\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-05 00:00+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -16,13 +17,11 @@ msgstr ""
 "X-Poedit-Country: ITALY\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Sçobera tipu de mèdiu"
 
-#: ../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 ""
 "is ajorronus ofitzialis po sa distribuidura. (Dus podis açungi ambaduus, ma\n"
 "d'as a depi fai in duus passus)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Mitzas de distribuidura"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Ajorronus ofitzialis"
 
-#: ../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,85 @@ msgstr ""
 "\n"
 "Fait a andai innantis?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Abeta açunju is mèdius"
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Açungi unu mèdiu"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "File localis"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Mori:"
 
-#: ../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 "Trastu arremoviditzu"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Mori o puntu de càrrigu:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Trastu arremoviditzu"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Sfollya..."
 
-#: ../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 "Mori acapiau po 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 "Ki du lassas arbu, circu in automàtigu synthesis/hdlist"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Nòmini:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Crea mèdius de totu sa distribuidura"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Circa custu mèdiu po ajorronus:"
 
-#: ../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 "Depis preni a su mancu is primu duus campus."
 
-#: ../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 +157,11 @@ msgstr ""
 "Dui at jai unu mèdiu cun custu nòmini, diaderus\n"
 "bolis a d'arrempratzai?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Açunju unu mèdiu:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tipu de mèdiu:"
 
@@ -193,10 +169,9 @@ msgstr "Tipu de mèdiu:"
 #: ../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 "Annudda"
 
@@ -205,101 +180,86 @@ msgstr "Annudda"
 #: ../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 "Totu is sceras po aposentai pakitus"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "sempri"
 
 #: ../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 "Aberiga is RPM de aposentai:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Scàrriga programa de impreai:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Arremovidura de is Mitzas"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Diaderus bolis arremovi sa mitza \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Abeta, arremovu su mèdiu..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Muda unu mèdiu"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Mudu su mèdiu \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Sarva is mudas"
 
-#: ../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 "Depis intrai su mèdiu po prosighiri"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Po podi sarvai is mudas, depis intrai su mèdiu in su ligidori."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Assètia is proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Assètius de su proxy po mèdius \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Totu is assètius de su proxy"
 
 #: ../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 +268,137 @@ msgstr ""
 "<proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Nòmini de host de su proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Podis indidai unu user/password po sa connoscidura de su proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Umperadori:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Açungi unu grupu parallelu"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Muda unu grupu parallelu"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Açungi unu lìmidi de mèdiu"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Sçobera unu mèdiu de açungi a su lìmidi mèdius:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Açungi unu host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Scrì su nòmini host o su bivimentu IP de s'host de açungi:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Mudu grupu parallelu \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Nòmini grupu:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocollu:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Lìmidi mèdius:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Açungi"
 
 #: ../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 "Burra"
 
 #: ../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 "Assètia urpmi parallelu (urpmi fatu girai in parallelu)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grupu"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocollu"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Lìmidi mèdius"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocollu"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Cumandu"
 
-#: ../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 "(nisçunu)"
 
-#: ../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 "Muda..."
 
-#: ../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 "Açungi..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Manija is crais po sa firma digidali de is pakitus"
 
-#: ../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èdiu"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Crais"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "no agatu nòmini, no dui at crai in su keyring de su rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Açungi una crai"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Sçobera una crai de açungi a su mèdiu %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Burra una crai"
 
 #: ../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 +407,31 @@ msgstr ""
 "(nòmini de sa crai: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Açungi una crai..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Burra crai"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Assètia mèdius"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Abivau?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Ajorronus?"
 
-#: ../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 +441,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Açungi..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Ajorronu..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Manija crais..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parallelu..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Totu is sceras..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Ajudu"
 
-#: ../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 +476,7 @@ msgstr ""
 "\n"
 "Fait a andai innantis?"
 
-#: ../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 ""
 "sa computadora. Apustis dus as apodi impreai po aposentai atrus pakitus\n"
 "o po fai ajorronus."
 
-#: ../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,23 @@ msgstr ""
 "de mèdius in d-una atra scriania, o jai imoi ses aposentendi\n"
 "pakitus?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "No potzu açungi su mèdiu, argumentus sballiaus o sbuidus"
 
-#: ../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 ""
+"Megas a açungi unu mèdiu de pakitus nou, `%s'.\n"
+"Custu bolit nai ca as a podi açungi pakitus de programa nous\n"
+"a su sistema de custu mèdiu."
+
+#: ../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 +529,22 @@ msgstr ""
 "Custu bolit nai ca as a podi açungi pakitus de programa nous\n"
 "a su sistema de custu mèdiu."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Acabau de açungi su mèdiu `%s'."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Acabau de açungi su mèdiu `%s'."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Impreu: %s [SCERA]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -621,46 +552,39 @@ msgstr ""
 "  --changelog-first      amosta su changelog innantis de sa filelist in sa "
 "fentana descriidora"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     firmadì a su mèdiu inditau"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     proponi de auniri totu is file .rpmnew/.rpmsave "
 "agataus"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            assètia sa modalidadi (aposenta (predefinia), "
 "srèxina, ajorrona)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      no ponjast preguntas de cunfirma in modalidadi "
 "ajorronu"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      no ajorronist is mèdius a s'alluidura"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        no controllist is firmas de is pakitus"
 
-#: ../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 +592,27 @@ msgstr ""
 "  --parallel=alias,host  in modalidadi parallela poni su grupu \"alias\", "
 "poni sa màkina \"host\" po amostai is dependèntzias ki serbint"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    amosta custus pakitus feti"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      cumentza sçoberendi custus pakitus"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 fai comenti e root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           circa \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Giru in modalidai umperadori"
 
-#: ../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 +622,517 @@ msgstr ""
 "No as a podi fai mudas in su sistema, ma as a podi sfollyai\n"
 "ancora su database ki dui est."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Acessibilidadi"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arcivadura"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Còpia de siguresa"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Scriidura CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Prensadura"
 
-#: ../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 "Atru"
 
-#: ../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 "Librus"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Librus de informàtiga"
 
-#: ../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 "Literadura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Trasladamentu de is Missadas"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Serbìtzius de Acoamentu"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Comunigaduras"
 
-#: ../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 "Adelantamentu"
-
-#: ../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 "Adelantamentu"
+
+#: ../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 "Manijadoris"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Imparu"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emuladoris"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Ainas po file"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Jogus"
-
-#: ../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 "Jogus"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Jogus de mesa"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cartas"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzzle"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Stradexia"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Scriania gràfiga"
-
-#: ../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 "Scriania gràfiga"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "fraigau cun 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àfiga"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Controllu"
 
-#: ../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 "Arretza"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Çarra"
 
-#: ../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 "Arretza"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transidura file"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Missadas istantanjas"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Curreu"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Noas"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Acessu atesu"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ofìtziu"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Crais Pùbrigas"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Imprenteria"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Scièntzias"
-
-#: ../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 "Scièntzias"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Bioloxia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kìmiga"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informàtiga"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Scièntzias de sa Terra"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matemàtiga"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fìsiga"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Sonu"
 
-#: ../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 "Fundamentali"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Assètiu"
+#: ../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 "Boot e Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Assètiu"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakitus"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Imprenta"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Aposentadura"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Aposentadura"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Litras"
-
-#: ../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 "Litras"
+
+#: ../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 "Intrenatzionallisadura"
 
-#: ../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 "Server"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminalis"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Ainas de scritura"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Joghitus"
 
-#: ../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 dui at)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Arresurtau de sa circa"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Arresurtau de sa circa (nudda)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Abeta, circu..."
 
-#: ../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 "Açungiditzu"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Ajorronaditzu"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Açungiditzu"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "No sçoberau"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Sçoberau"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "No sçoberau"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Importu: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Arrexoni po ajorronai: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Nisçuna descriidura"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Files:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Mèdiu: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versioni aposentada imoi: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nòmini: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versioni: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arkidetura:"
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Manniori: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Importu: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Manniori: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Arresùmini: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Arrexoni po ajorronai: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Descriidura: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Nisçuna descriidura"
+#. 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 "Atras scedas po su pakitu..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Sçobera"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Serbit unu de is pakitus ki sighint:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Sçobera"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Abeta, allistru is pakitus..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Nisçunu ajorronu"
 
-#: ../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 +1142,24 @@ msgstr ""
 "ajorronu po is pakitus aposentaus in sa computadora, opuru\n"
 "ca dus as jai aposentaus totus."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Totu"
 
 #. -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 "Atra sceda"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Sceda po is pakitus"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Cancu pakitu in prus bolit srexinau"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1373,13 +1169,11 @@ msgstr ""
 "srexinaus:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "No fait a srexinai cancu pakitu"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1387,8 +1181,7 @@ msgstr ""
 "Srexinai custus pakitus iat a arrogai su sistema, mi spraxit:\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 +1191,11 @@ msgstr ""
 "disisçoberaus imoi:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Serbint pakitus in prus"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1414,18 +1205,17 @@ msgstr ""
 "aposentaus:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (est in sa lista de is sartadas)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "No fait a aposentai cancu pakitu"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1435,123 +1225,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Cancu pakitu bolit srexinau"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Sçoberu: %d MB / Spàtziu discu lìberu: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Manniori de su sçoberu: %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 "No dui at descriidura po custu pakitu\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Ajorronus de siguresa"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Ajorronus de funtzionalidadi"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Aposenta"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Ajorronus normalis"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Aposenta"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s sçoberus"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Sçoberus 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 "Totu is pakitus, po litra"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Totu is pakitus, po grupu"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Totu is pakitus po disposta de ajorronu"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Totu is pakitus, po manniori"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Totu is pakitus, po stadu de sçoberu"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Totu is pakitus, po mèdiu"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Totu is pakitus po disposta de ajorronu"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Is follas feti, allistradas po dì"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Totu is pakitus, po grupu"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Ajorronus normalis"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Ajorronus de funtzionalidadi"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Ajorronus normalis"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Ajorronus de siguresa"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "in is nòminis"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "in is descriiduras"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "in is nòminis de is file"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Sceda normali"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Totu sa sceda"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Po primu cosa depis sçoberai cancu pakitu."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Tropu pakitus sçoberaus"
 
 #: ../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"
@@ -1568,7 +1343,7 @@ msgstr ""
 "Diaderus bolis aposentai totu is pakitus sçoberaus?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1582,89 +1357,100 @@ msgstr ""
 "\n"
 "Fait a andai innantis?"
 
-#: ../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
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/Ajorrona mèdi_u"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/A_rrecasça su sçoberu"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Torra a carrigai sa lista _pakitus"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Bessi"
 
-#: ../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 "/_Sceras"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Amo_sta in automàtigu is pakitus sçoberaus"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Ajudu"
 
-#: ../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 "Agata:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Circa"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Lìmpia"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Aposenta"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Bessi"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Faddina mortali"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Faddina mortali: %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"
@@ -1676,13 +1462,12 @@ msgstr ""
 "\n"
 "Fait a andai innantis?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Mèdiu de ajorronu ki jai dui est"
 
-#: ../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"
@@ -1698,13 +1483,12 @@ msgstr ""
 "\n"
 "Apustis, torra a allui %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Comenti sçoberai a manu su sprigu"
 
-#: ../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"
@@ -1718,58 +1502,56 @@ msgstr ""
 "\n"
 "Apustis torra a allui %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Abeta, agatu is pakitus a disposta..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Abeta, liju su database de is pakitus..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Controllu %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "mudas:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Srèxina .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Imprea .%s ke file primarju"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "No fatzas nudda"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Aposentadura acabada"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Controllu..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Totu is pakitus bòfius funt acabaus de aposentai."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Barrancu in s'aposentadura"
 
-#: ../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"
@@ -1779,18 +1561,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "No potzu lompi a is pakitus mitza."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "No potzu lompi a is pakitus mitza, mi spraxit. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1802,38 +1583,34 @@ msgstr ""
 "Faddina(s) arrelatada(s):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Aposentadura pakitus..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Apariçu..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Aposentadura pakitus..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Càmbia mèdiu"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Intra su mèdiu nominau \"%s\" in su trastu [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Scàrrigu pakitu `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Aberigu is firmas de is pakitus..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1847,13 +1624,12 @@ msgstr ""
 "\n"
 "Bolis prosighiri s'aposentadura?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Aposentadura faddia"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1865,23 +1641,22 @@ msgstr ""
 "\n"
 "Forsis bolis ajorronai su database de is mèdius."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Apariçu s'aposentadura de is pakitus..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Aposentu su pakitu `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "no potzu lompi a su file rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1893,43 +1668,33 @@ msgstr ""
 "Apu creau unus cantu file ke `.rpmnew' o `.rpmsave',\n"
 "imoi dus podis controllai po detzidi cancu atzioni:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Custus pakitus tenint scedas de adelantamentu"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Atras scedas po su pakitu... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nisçunu pakitu agatau po d'aposentai."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Faddina mortali: nisçunu pakitu agatau po d'aposentai, mi spraxit."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Abeta, liju su database de is pakitus..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Abeta, srèxinu is pakitus..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Barrancu in sa srexinadura"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1939,8 +1704,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1952,8 +1716,8 @@ msgstr ""
 "Custa aina t'at a ajudai a sçoberai cali programas bolis srexinai de\n"
 "sa computadora."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1965,13 +1729,11 @@ msgstr ""
 "Custa aina t'at a ajudai a sçoberai is ajorronus ki bolis aposentai in\n"
 "sa computadora."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Beni beniu a su software installation tool!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1985,214 +1747,172 @@ msgstr ""
 "in CDROM o DVD. Custa aina t'at a ajudai a sçoberai cali programas\n"
 "bolis aposentai in sa computadora."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Ajorronamentus Programas"
-
-#: ../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 "Ajorronamentus Programas"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Po praxeri, intra is scedas tuas po lompi a su proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "User name:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Software Packages Removal"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Software Packages Update"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Software Packages Installation"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Eya"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Sceda..."
 
-#: ../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 "Belju"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brasili"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Cànada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Svìtzera"
 
-#: ../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 "Arrepùbriga Ceca"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Germània"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Danimarca"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grexa"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spannya"
 
-#: ../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 "Ungheria"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israeli"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Itàlia"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japoni"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Olanda"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvexa"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polònia"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugallu"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rùssia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Svètzia"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovàkia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Arrennu Uniu"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Cina"
 
-#: ../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 "Stadus Unius"
 
-#: ../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"
@@ -2204,8 +1924,7 @@ msgstr ""
 "\n"
 "Fait a andai innantis?"
 
-#: ../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"
@@ -2217,23 +1936,26 @@ msgstr ""
 "\n"
 "Fait a andai innantis?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s sçoberus"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Abeta, scàrrigu is bivimentus de is sprigus."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Abeta, scàrrigu is bivimentus de is sprigus de su jassu 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 "Faddina in su scarrigamentu"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2247,8 +1969,8 @@ msgstr ""
 "Forsis no giràt s'arretza o su jassu web.\n"
 "Torra a provai apustis."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2262,18 +1984,15 @@ msgstr ""
 "Forsis no giràt s'arretza o su jassu web de Mandriva.\n"
 "Torra a provai apustis."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nisçunu sprigu"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "No potzu agatai unu sprigu ki andit."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2287,69 +2006,64 @@ msgstr ""
 "est candu is Ajorronus Ofitzialis de Mandriva Linux no suportant\n"
 "s'arkidetura de su processori."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Sçobera su sprigu ki bolis."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Còpiu file po su mèdiu `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Controllu is file de su mèdiu `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Controllu su file atesu de su mèdiu `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " fatu."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " faddiu!"
 
 #. -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 su mèdiu %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Cumentzu a scarrigai `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Scàrrigu de `%s', tempus abarrau:%s, lestriori:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Scàrrigu de `%s', lestriori:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Abeta, ajorronu is mèdius..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Faddina agatendi is pakitus"
 
-#: ../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"
@@ -2364,34 +2078,29 @@ msgstr ""
 "torrai a açungi po d'assetiai, opuru imoi no fait a nci lompi e depis\n"
 "provai prus a tradu."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Ajorrona mèdius"
 
-#: ../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 "Sçobera is mèdius ki bolis ajorronai:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Sçobera totu"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Ajorrona"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2403,8 +2112,8 @@ msgstr ""
 "Faddinas:\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"
@@ -2414,18 +2123,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "No potzu creai su mèdiu."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Faddina açungendi su mèdiu."
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2435,8 +2142,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"
@@ -2446,8 +2153,8 @@ msgstr ""
 "impreas (%s).\n"
 "D'apu a disabivai."
 
-#: ../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"
@@ -2457,13 +2164,11 @@ msgstr ""
 "Linux ki impreas (%s).\n"
 "D'apu a disabivai."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Ajudu lançau 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 ""
@@ -2739,6 +2444,18 @@ msgstr "Srèxina programas"
 msgid "Software Media Manager"
 msgstr "Manijadori de Mèdius de Programas"
 
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Totu is pakitus, po mèdiu"
+
+#~ msgid "Normal information"
+#~ msgstr "Sceda normali"
+
+#~ msgid "Maximum information"
+#~ msgstr "Totu sa sceda"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "totu acabau de aposentai"
 
diff --git a/po/sk.po b/po/sk.po
index 474dd616..d7cd191c 100644
--- a/po/sk.po
+++ b/po/sk.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-09-07 17:34+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -16,13 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Vyberte typ 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"
@@ -45,18 +44,16 @@ msgstr ""
 "oficiálne aktualizácie pre vašu distribúciu. Zvoliť môžete obidve možnosti\n"
 "budete však musieť vykonať dva kroky."
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Distribučné zdroje"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Oficiálne aktualizácie"
 
-#: ../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"
@@ -75,104 +72,85 @@ msgstr ""
 "\n"
 "Je možné pokračovať?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Prosím čakajte, pridávajú sa médiá..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Pridať zdroj"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokálne súbory"
 
-#: ../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 "Vymeniteľné zariadenie"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Cesta alebo bod pripojenia:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Vymeniteľné zariadenie"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Prechádzať..."
 
-#: ../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 "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 "Relatívna cesta k 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 "Ak ponecháte nevyplnené, synthesis/hdlist budú automaticky nájdené"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Meno:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Vytvoriť zdroj pre celú distribúciu"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Prehľadať toto médium na aktualizácie"
 
-#: ../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 "Je potrebné vyplniť najmenej prvé dve položky."
 
-#: ../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?"
@@ -180,13 +158,11 @@ msgstr ""
 "Už existuje zdroj s takýmto menom, chcete ho\n"
 "skutočne prepísať?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Pridanie zdroja:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Typ média:"
 
@@ -194,10 +170,9 @@ msgstr "Typ 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 "Zrušiť"
 
@@ -206,101 +181,86 @@ msgstr "Zrušiť"
 #: ../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 "Celkové možnosti inštalácie balíkov"
 
 #: ../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 "Kontrola balíkov, ktoré budú nainštalované:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Sťahovanie programu pre použitie:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Odstránenie zdroja"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ste si istý, že chcete odstrániť zdroj  \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Prosím čakajte, odstraňuje sa zdroj..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Zmeniť zdroj"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Zmena média \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Uložiť zmeny"
 
-#: ../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 "Vložte médium ak chcete pokračovať"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Pre uloženie zmien je potrebné aby ste vložili médium do mechaniky."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Nastaviť proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Nastavenie proxy pre zdroj  \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globálne nastavenie proxy"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -309,166 +269,137 @@ msgstr ""
 "<adresaproxy[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Hostiteľ proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Môžete zadať užívateľské meno/heslo pre proxy autentifikáciu:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Používateľ:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Pridať paralelnú skupinu"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Zmeniť paralelnú skupinu"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Pridať limit média"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Vyberte si zdroj pre pridanie k obmedzeným zdrojom:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Pridať hostiteľa"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Zadajte meno alebo IP adresu zdroja ktorý chcete pridať:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Úprava paralelnej skupiny \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Meno skupiny:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Limit zdroja:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Pridať"
 
 #: ../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 "Odstrániť"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Hostitelia:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfigurácia paralelného urpmi (distribuované spúšťanie 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 "Limit zdroja"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Prí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 "(žiadna)"
 
-#: ../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 "Zmeň"
 
-#: ../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 "Pridať..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Správa kľúčov pre elektronické podpisy balíkov"
 
-#: ../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 "Stredná"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Kľúče"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "žiadne meno nebol nájdené, kľúč neexistuje na rpm zväzku kľúčov!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Pridať kľúč"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Vyberte si kľúč na pridanie k zdroju %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Odstrániť kľúč"
 
 #: ../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 ""
 "(meno kľúča: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Pridať kľúč..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Odstrániť kľúč"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Nastaviť média"
 
-#: ../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 "Aktualizácie?"
 
-#: ../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 "Pridať vlastný..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Aktualizácia..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Správa kľúčov..."
 
-#: ../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álne nastavenia.."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../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"
 "Je možné pokračovať?"
 
-#: ../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 ""
 "použiť pre váš systém. Tieto balíky budú dostupné pri inštalácii nových\n"
 "balíkov alebo pri vykonávaní aktualizácií."
 
-#: ../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"
@@ -585,13 +502,23 @@ msgstr ""
 "pracujú s databázou balíkov (napríklad iný správca balíkov na\n"
 "inej ploche, alebo sa práve inštalujú iné balíky?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Nie je možné pridať zdroj, chybné alebo chýbajúce argumenty"
 
-#: ../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 ""
+"Chcete pridať zdroj obsahujúce nové rpm balíky `%s'.\n"
+"Znamená to, že bude možné pridávať nové softvérové balíky\n"
+"do vášho systému z tohto nového 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"
@@ -601,18 +528,22 @@ msgstr ""
 "Znamená to, že bude možné pridávať nové softvérové balíky\n"
 "do vášho systému z tohto nového média."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Úspešne pridaný zdroj `%s'."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Úspešne pridaný zdroj `%s'."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Použitie: %s [VOĽBA]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -620,45 +551,38 @@ msgstr ""
 "  --changelog-first      zobraziť zoznam zmien pred výpisom súborov v okne s "
 "popisom"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     obmedziť na vybrané médiá"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     navrhnúť spojenie všetky nájdených súborov .rpmnew/."
 "rpmsave"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            nastavenie režimu (inštalácia (predvolené), "
 "odstránenie, aktualizácia)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      nepýtať sa na potvrdenie v režimu aktualizácie"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      neaktualizovať toto médium pri spustení"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        nekontrolovať podpisy balíkov"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -666,33 +590,27 @@ msgstr ""
 "  --parallel=alias,host  paralelný režim, použitie \"alias\" pre skupinu, "
 "použitie \"host\" pre meno hostiteľa na zobrazenie vyžadovaných závislostí"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    zobraziť iba tieto balíky"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      predvýber týchto balíkov"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 vnútiť bez pod používateľom root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           spustiť vyhľadávanie pre \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Beh v používateľskom režime"
 
-#: ../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"
@@ -702,634 +620,517 @@ msgstr ""
 "Nebude vám umožnené vykonať systémové modifikácie,\n"
 "ale budete môcť prehliadať existujúcu databázu."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Dostupnosť"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Archivovanie"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Záloha"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Napaľovanie CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Kompresia"
 
-#: ../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 "Iné"
 
-#: ../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čove knihy"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Často kladené otázky"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Ako na to"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatúra"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Klaster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Triedenie správy"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Opytovanie služieb"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikácia"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Databázy"
 
-#: ../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 "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 "Editory"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Výučba"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulátory"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Súborove 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 "Nástenky"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Karty"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzzle"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Šport"
 
-#: ../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 "Grafická pracovná plocha"
-
-#: ../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á pracovná plocha"
+
+#: ../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 "Monitorovanie"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Multimédiá"
 
-#: ../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 "Sieť"
-
-#: ../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 "Sieť"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Prenos súborov"
 
-#: ../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šta"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Správy"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Vzdialený prístup"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Kancelária"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Verejné kľúče"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publikovanie"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Veda"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronómia"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Veda"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biológia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chémia"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Počítačové vedy"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geológia"
 
-#: ../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 "Konfigurácia"
+#: ../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 "Štart s inicializácia"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigurácia"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Balíkovanie"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Tlač"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Vývoj"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Vývoj"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Písma"
-
-#: ../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 "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 "X11 bitmapa"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalizácia"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel a hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Knižnice"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servre"
 
-#: ../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 "Textove 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 "(Nedostupné)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Výsledky vyhľadávania"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Výsledky vyhľadávania (žiadne)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Prosím čakajte, vyhľadávam..."
 
-#: ../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 "Pridateľné"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Aktualizovateľné"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Pridateľné"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Neoznačené"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Vybrané"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Neoznačené"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Dôležitosť: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Dôvod pre aktualizáciu:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Bez popisu"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Súbory:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Záznam zmien:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Zdroj:"
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Aktuálne nainštalovaná verzia:"
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Názov: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Verzia: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Architektúra:"
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Veľkosť: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Dôležitosť: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Veľkosť: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Stručný obsah: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Dôvod pre aktualizáciu:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Popis:"
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Bez popisu"
+#. 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 "Viac informácii o balíku..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Prosím zvoľte"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Jeden z nasledujúcich balíkov je potrebný:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Prosím zvoľte"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Prosím čakajte, vypisujú sa balíky..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Žiadna aktualizácia"
 
-#: ../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"
@@ -1339,29 +1140,24 @@ msgstr ""
 "dostupné žiadne aktualizácie pre balíky nainštalované vo vašom\n"
 "systéme alebo už máte všetky nainštalované."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Všetko"
 
 #. -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 "Viac informácií"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informácie o balíkoch"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Je potrebné odstrániť niektoré balíky"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1370,13 +1166,11 @@ msgstr ""
 "Kvôli závislostiam budú nasledovné balíky odstránené:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Niektoré balíky nie je možné odstrániť"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1384,8 +1178,7 @@ msgstr ""
 "Odstránenie týchto balíkov naruší váš systém, prepáčte:\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"
@@ -1394,13 +1187,11 @@ msgstr ""
 "Kvôli závislostiam musia byť nasledujúce balíky teraz odznačené:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Sú potrebné ďalšie balíky"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1409,18 +1200,17 @@ msgstr ""
 "Pre vyriešenie závislosti, sú potrebné nainštalovať tieto balíky:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (patrí na zoznam preskočných)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Niektoré balíky nebolo možné nainštalovať"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1430,123 +1220,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Je potrebné odstrániť niektoré balíky"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Vybrané: %d MB / Dostupné: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Vybraná veľkosť: %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 pre tento balík nie je dostupný\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Bezpečnostné aktualizácie"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Aktualizácie opravujúce chyby"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Inštaluj"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normálne aktualizácie"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Inštaluj"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s voľby"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Voľby 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šetky balíky, zoradené abecedne"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Všetky balíky, podľa skupiny"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Všetky balíky, podľa dostupnosti aktualizácie"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Všetky balíky, podľa veľkosti"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Všetky balíky podľa stavu výberu"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Všetky balíky podľa zdroja"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Všetky balíky, podľa dostupnosti aktualizácie"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Iba ponechať, zoradiť podľa dátumu inštalácie"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Všetky balíky, podľa skupiny"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normálne aktualizácie"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Aktualizácie opravujúce chyby"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normálne aktualizácie"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Bezpečnostné aktualizácie"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "v menách"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "v popisoch"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "v menách súborov"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normálne informácie"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maximálne informácie"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Je potrebné najprv vybrať niektoré balíky."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Vybrali ste príliš veľa balíkov"
 
 #: ../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 +1338,7 @@ msgstr ""
 "Skutočne si želáte nainštalovať všetky zvolené balíky?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1577,89 +1352,100 @@ msgstr ""
 "\n"
 "Je možné pokračovať?"
 
-#: ../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 "/_Súbor"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Akutalizácia média"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Resetovať výber"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Obnova zoznamu balíkov"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Koniec"
 
-#: ../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 "/_Nastavenia"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Zobraziť automaticky zvolené balíky"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Pomoc"
 
-#: ../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 "Hľadať:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Vyprázdniť"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Inštaluj"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Fatálna chyba"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Nastala fatálna 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"
@@ -1671,13 +1457,12 @@ msgstr ""
 "\n"
 "Je možné pokračovať?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Už existuje zdroj s aktualizáciami"
 
-#: ../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"
@@ -1692,13 +1477,12 @@ msgstr ""
 "\n"
 "Potom reštartujte %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Ako si zvoliť zrkadlo manuálne"
 
-#: ../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"
@@ -1712,58 +1496,56 @@ msgstr ""
 "\n"
 "Potom je potrebné reštartovať %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Prosím čakajte, hľadajú sa dostupné balíky..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Prosím čakajte, načítava sa databáza balíkov..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Preveruje sa %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "zmeny:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Odstrániť .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Použite .%s ako hlavný súbor"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Neurobiť nič"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Inštalácia ukončená"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Preveriť.."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Všetky požadované balíky boli úspešne nainštalované."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problém počas inštalácie"
 
-#: ../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"
@@ -1773,18 +1555,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Nie je možné prebrať zdrojové balíky."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Nie je možné získať zdrojové balíky. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1796,38 +1577,34 @@ msgstr ""
 "Ohlásená chyba:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Inštalácia balíkov..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicializácia..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Inštalácia balíkov..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Vymeniť médium"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prosím vložte médium s názvom \"%s\" do zariadenia [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Získavanie balíka `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Overovanie podpisov balíkov..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1841,13 +1618,12 @@ msgstr ""
 "\n"
 "Chcete pokračovať v inštalácii?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Inštalácia neúspešná"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1859,23 +1635,22 @@ msgstr ""
 "\n"
 "Možno bude potrebné aktualizovať databázu zdrojov."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Príprava balíkov na inštaláciu..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Inštalácia balíka `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "nie je možné pristúpiť k súboru rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1887,43 +1662,33 @@ msgstr ""
 "Niektoré konfiguračné súbory boli vytvorené ako `.rpmnew' alebo `.rpmsave',\n"
 "mali by ste ich prezrieš:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Tieto balíky obsahujú informáciu o aktualizácii"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Viac informácii o balíku... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nebol nájdený žiaden balík pre inštaláciu."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Neobnoviteľná chyba: neboli nájdené žiadne balíky pre inštaláciu."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosím čakajte, načítava sa databáza balíkov..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Prosím čakajte, odstraňujú sa balíky..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problém počas odstraňovania"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1933,8 +1698,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1946,8 +1710,8 @@ msgstr ""
 "Tento nástroj vám pomôže si zvoliť softvér ktorý chcete odstrániť\n"
 "z vášho počítača."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1960,13 +1724,11 @@ msgstr ""
 "vášho\n"
 "počítača."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Vitajte v nástroji pre inštaláciu softvéru!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1981,214 +1743,172 @@ msgstr ""
 "inštalácii\n"
 "softvéru na váš počítač."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Obnova softvéru"
-
-#: ../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 "Obnova softvéru"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Zadajte vaše autorizačné údaje pre prístup k proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Používateľské meno:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Odstránenie softvérových balíkov"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Obnovenie softvérových balíkov"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Príprava balíkov na inštaláciu"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Nie"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ano"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Rakúsko"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Austrália"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgicko"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazília"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Švajčiarsko"
 
-#: ../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 "Česká Republika"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Nemecko"
 
-#: ../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 "Grécko"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Španielsko"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Fínsko"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Francúzsko"
 
-#: ../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 "Taliansko"
 
-#: ../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 "Holandsko"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Nórsko"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Poľsko"
 
-#: ../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 "Slovenská Republika"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Veľká Británia"
 
-#: ../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é Štá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"
@@ -2200,8 +1920,7 @@ msgstr ""
 "\n"
 "Je možné pokračovať?"
 
-#: ../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 +1932,26 @@ msgstr ""
 "\n"
 "Je možné pokračovať?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s voľby"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Prosím čakajte, sťahujem adresy zrkadlových serverov."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Prosím čakajte, sťahujem adresy mirorov z web stránky 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 počas sťahovania"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2243,8 +1965,8 @@ msgstr ""
 "Sieť, alebo stránka sú nedostupné.\n"
 "Prosím, skúste neskôr."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2258,18 +1980,15 @@ msgstr ""
 "Sieť, alebo websajt Mandriva sú zrejme nedostupné.\n"
 "Prosím, skúste neskôr"
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Žiaden miror"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Nebolo možné nájsť zodpovedajúce zrkadlo."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2283,69 +2002,64 @@ msgstr ""
 "že architektúra vášho procesora nie je podpororovaná oficiálnymi\n"
 "aktualizáciami Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Prosím zvoľte si jeden z mirorov."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopíruje sa súbor pre médium `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Preverujú sa súbory zo zdroja '%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Preverujú sa vzdialené súbory pre zdroj '%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " hotovo."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " chyba!"
 
 #. -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 z média %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Spustenie získavania `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Získavanie '%s', čas do konca: %s, rýchlosť: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Získavanie '%s', rýchlosťou: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Prosím čakajte, aktualizujem média..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Chyba pri získavaní balíkov"
 
-#: ../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"
@@ -2361,34 +2075,29 @@ msgstr ""
 "pokračovať\n"
 " neskôr"
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Aktualizácia zdroja"
 
-#: ../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 "Prosím zvoľte zdroj, ktorý chcete aktualizovať:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Vybrať všetky"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Aktualizácia"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2400,8 +2109,8 @@ msgstr ""
 "Chyba:\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"
@@ -2411,18 +2120,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Nemôžem vytvoriť zdroj."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Chyba pri pridávaní zdroja"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2432,8 +2139,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"
@@ -2443,8 +2150,8 @@ msgstr ""
 "ktorú používate (%s).\n"
 "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"
@@ -2454,13 +2161,11 @@ msgstr ""
 "verziu Mandriva Linuxu ($15%s).\n"
 "Preto bude vypnuté."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Pomoc spustená na pozadí"
 
-#: ../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 +2442,18 @@ msgstr "Odstrániť softvér"
 msgid "Software Media Manager"
 msgstr "Manažér zdrojov softvéru"
 
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Všetky balíky podľa zdroja"
+
+#~ msgid "Normal information"
+#~ msgstr "Normálne informácie"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maximálne informácie"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "všetko bolo úspešne nainštalované"
 
diff --git a/po/sl.po b/po/sl.po
index 9c1a030f..c0fbb5d7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -16,7 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sl\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-16 08:34+0200\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@sdm-si.org>\n"
 "Language-Team:  <sl@li.org>\n"
@@ -25,13 +26,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 "Izberite vrsto vira"
 
-#: ../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"
@@ -53,18 +52,16 @@ msgstr ""
 "ali pa vire z uradnimi posodobitvami za vašo distribucijo.\n"
 "(Lahko dodate oba, a boste morali to narediti v dveh korakih.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Viri distribucije"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Uradne posodobitve"
 
-#: ../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,85 @@ msgstr ""
 "\n"
 "Nadaljevanje?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Prosim počakajte, dodajanje vira ..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Dodaj vir"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Krajevne datoteke"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Pot:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Strežnik 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 "Strežnik FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Strežnik HTTP "
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Izmenljivi medij"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Pot ali priklopna točka:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Izmenljivi medij"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Brskaj..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Uporabniško ime:"
 
-#: ../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 "Geslo:"
 
-#: ../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 "Relativna pot 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 "Če pustite prazno, bo synthesis/hdlist samodejo preiskan"
 
-#: ../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 "Ustvarjanje vira za celotno distribucijo"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Preišči vir za posodobitve"
 
-#: ../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 "Izpolniti morate najmanj prvi dve polji."
 
-#: ../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 +166,11 @@ msgstr ""
 "Vir s tem imenom že obstaja, ali ga\n"
 "želite zamenjati?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Dodajnje vira:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Vrsta vira:"
 
@@ -202,10 +178,9 @@ msgstr "Vrsta vira:"
 #: ../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 "Prekliči"
 
@@ -214,101 +189,86 @@ msgstr "Prekliči"
 #: ../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 "V redu"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Globalne možnosti za namestitev paketov"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "vedno"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nikoli"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Preverjanje paketov RPM, ki bodo nameščeni:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Program za prenašanje:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Odstranjevanje vira"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ali ste prepričani, da želite odstraniti vir \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Prosim počakajte, odstranjevanje vira..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Uredi vir"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Urejanje vira \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Shrani spremembe"
 
-#: ../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 "Posrednik..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Za nadaljevanje morate vstaviti nosilec podatkov"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Da bi shranili spremembe, morate vstaviti nosilec podatkov v pogon."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Nastavite posrednikov"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Nastavitve posrednika za vir \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globalne nastavitve posrednika"
 
 #: ../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 +277,138 @@ msgstr ""
 "<ime gostitelja[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Ime gostitelja posrednika (hostname):"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Lahko določite uporabnika/geslo za avtentifikacijo posrednika:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Uporabnik:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Dodaj vzporedno skupino"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Uredi vzporedno skupino"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Dodaj omejitev vira"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Izberite vir, bi bo dodajan med omejene vire:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Dodaj gostitelja"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Vpišite ime ali IP naslov gostitelja, ki ga dodajate:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Urejanje vzporedne skupine \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Ime skupine:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Omejitev virov:"
 
 #: ../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 "Odstrani"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Gostitelji:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Nastavi vzporedni urpmi (razpršeno izvajanje za 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 "Omejitev vira"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Ukaz"
 
-#: ../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 "(noben)"
 
-#: ../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 "Uredi..."
 
-#: ../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 "Upravljanje s ključi digitalnih podpisov paketov"
 
-#: ../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 "Vir"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Ključi"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 "nobenega imena ni mogoče najti, ključ v rpm obesku za ključe ne obstaja!"
 
 #: ../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 "Izberite ključ za dodajanje viru: %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Odstrani 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)"
@@ -486,37 +417,31 @@ 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 "Odstrani ključ"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Nastavi vir"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Omogočen?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Posodobitve?"
 
-#: ../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"
@@ -526,38 +451,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Dodaj po meri ..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Posodabljanje..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Upravljanje s ključi"
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Vzporedno..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Globalne možnosti ..."
 
-#: ../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"
@@ -567,8 +486,7 @@ msgstr ""
 "\n"
 "Nadaljevanje?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -582,8 +500,7 @@ msgstr ""
 "na računalniku. Viri bodo na voljo za nameščanje nove programske opreme\n"
 "ali za posodabljanje obstoječe."
 
-#: ../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"
@@ -595,13 +512,23 @@ msgstr ""
 "na drugem namizju odprt še en upravitelj virov, ali zdaj\n"
 "nameščate pakete?)"
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Ne morem dodati vira, parametri so napačni ali manjkajo"
 
-#: ../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 ""
+"Dodali boste nov vir paketov, `%s'.\n"
+"To pomeni, da boste lahko s tega novega vira dodajali nove\n"
+"programske pakete v vaš sistem."
+
+#: ../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"
@@ -611,18 +538,22 @@ msgstr ""
 "To pomeni, da boste lahko s tega novega vira dodajali nove\n"
 "programske pakete v vaš sistem."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Vir `%s' je uspešno dodan."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Vir `%s' je uspešno dodan."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Uporaba: %s [MOŽNOSTI]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -630,44 +561,37 @@ msgstr ""
 "  --changelog-first      prikaže dnevnik sprememb (changelog) pred seznamom "
 "datotek v oknu za opis"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..    omejitev na dani vir"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 " --merge-all-rpmnew     predlagaj za združitev vseh najdenih datotek ."
 "rpmnew/.rpmsave"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            nastavi način (namesti (privzeto), odstrani, "
 "posodobi)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      pri nadgrajevanju ne zahtevaj potrditve"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      ob zagonu ne posodobi vira"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        ne preveri podpisov paketov"
 
-#: ../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 +599,27 @@ msgstr ""
 "  --parallel=alias,host  paralelni način, uporabi \"alias\" skupino, uporabi "
 "\"host\" računalnik za prikaz potrebnih odvisnosti"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    prikaži samo določene pakete"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      predhodno izberi določene pakete"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 poženi kot korenski uporabnik (root)"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg          poženi iskanje za \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Teče v uporabniškem načinu"
 
-#: ../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 +629,517 @@ msgstr ""
 "Ne boste mogli spreminjati sistema, lahko pa boste\n"
 "še vedno brskali po obstoječi bazi."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Dostopnost"
 
-#: ../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 "Varnostne kopije"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Zapisovanje CDjev"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Stiskanje"
 
-#: ../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 "Drugo"
 
-#: ../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čunalniške knjige"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "FAQ (vprašanja)"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "HowTo (navodila)"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Gruča"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Predajanje sporočil"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Storitve vrst"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikacije"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Baze podatkov"
 
-#: ../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 "Razvoj"
-
-#: ../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 "Razvoj"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME in GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE in Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Jedro"
 
-#: ../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 "Urejevalniki"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Izobraževanje"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatoriji"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Datotečna orodja"
 
-#: ../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 "Pustolovščina"
 
-#: ../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 "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Deske"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Karte"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Sestavljanke"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Športi"
 
-#: ../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čno namizje"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Razsvetljenstvo"
 
-#: ../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čno namizje"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Osnovano 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 "Nadzorovanje"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Večpredstavnost"
 
-#: ../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 "Povezovanje"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Klepet"
 
-#: ../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 "Povezovanje"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Prenos datotek"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Izmenjava sporočil"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Novice"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Oddaljen dostop"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Pisarna"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Javni ključi"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Založništvo"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Znanost"
-
-#: ../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 "Znanost"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kemija"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Računalništvo"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geologija"
 
-#: ../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 "Lupine"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Zvok"
 
-#: ../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 "Osnova"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Nastavitev"
+#: ../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 "Zagon in inicializacija"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Nastavitev"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Strojna oprema"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakiranje"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Tiskanje"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Postavitev"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Postavitev"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Pisave"
-
-#: ../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 "Pisave"
+
+#: ../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 bitna slika"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalizacija"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Jedro in strojna oprema"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Knjižnice"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Strežniki"
 
-#: ../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 "Tekstovna orodja"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Igrače"
 
-#: ../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 "(Ni na voljo)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Rezultati iskanja"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Rezultati iskanja (brez)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Prosim počakajte, iskanje v teku..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Ustavi"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Za dodajanje"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Za nadgradnjo"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Za dodajanje"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Ni izbrano"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Izbran"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Ni izbrano"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Pomembnost:"
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Razlog za posodobitev: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Brez opisa"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Datoteke:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Seznam sprememb:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Vir: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Trenutno nameščena različica: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Različica: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Arhitektura: "
 
-#: ../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 "Pomembnost:"
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Velikost: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Povzetek:"
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Razlog za posodobitev: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Brez 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 "Več informacij o paketu..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Prosim izberite"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Potrebujete enega od naslednjih paketov:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Prosim izberite"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Prosim počakajte, paketi se izpisujejo..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Brez posodobitve"
 
-#: ../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 +1149,24 @@ msgstr ""
 "za pakete, ki ste jih namestili na računalnik,\n"
 "ali pa ste že namestili vse."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Vse"
 
 #. -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 "Več podatkov"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informacije o paketih"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Nekaj dodatnih paketov je potrebno odstraniti"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1380,13 +1176,11 @@ msgstr ""
 "naslednje pakete:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Nekaterih paketov ni mogoče odstraniti"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1394,8 +1188,7 @@ msgstr ""
 "Odstranitev teh paketov bi onesposobila vaš sistem:\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 +1197,11 @@ msgstr ""
 "Zaradi njihovih odvisnosti naslednjih paketov ni mogoče izbrati:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Potrebni so dodatni paketi"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1420,18 +1211,17 @@ msgstr ""
 "naslednje pakete:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (pripada seznamu izpuščenih)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Nekaterih paketov ni mogoče namestiti"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1441,123 +1231,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Nekaj paketov je potrebno odstraniti"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izbrano: %d MB / Prosti disk: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Izbrana velikost: %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 za ta paket ni na voljo\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Varnostne posodobitve"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Popravki napak"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Namesti"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Navadne posodobitve"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Namesti"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s izbire"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux izbire"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Vsi paketi po abecedi"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Vsi paketi po skupini"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Vsi paketi po posodobitvah, ki so na voljo"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Vsi paketi po velikosti"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Vsi paketi po stanju izbire"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Vsi paketi po virih"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Vsi paketi po posodobitvah, ki so na voljo"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Samo listi, urejeni po datumu namestitve"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Vsi paketi po skupini"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Navadne posodobitve"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Popravki napak"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Navadne posodobitve"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Varnostne posodobitve"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "v imenih"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "v opisih"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "v imenih datotek"
 
-#: ../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 "Najprej morate izbrati pakete."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Izbranih je preveč paketov"
 
 #: ../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"
@@ -1573,7 +1348,7 @@ msgstr ""
 "Ali resnično želite namestiti vse izbrane pakete?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1587,89 +1362,100 @@ msgstr ""
 "\n"
 "Nadaljevanje?"
 
-#: ../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 "/_Posodobi vire"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Ponovno nastavi izbiro"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Ponovno _naloži seznam paketov"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Končaj"
 
-#: ../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 "/_Možnosti"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Pokaži samodejno izbrane pakete"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: ../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 posodobitev"
+
+#. -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 "Najdi:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Iskanje"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Počisti"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Namesti"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Izhod"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Usodna napaka"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Zgodila se je usodna napaka: %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"
@@ -1682,13 +1468,12 @@ msgstr ""
 "\n"
 "Nadaljevanje?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Že obstoječi viri za posodobitev"
 
-#: ../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"
@@ -1704,13 +1489,12 @@ msgstr ""
 "\n"
 "Potem ponovno zaženite %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Kako ročno izbrati zrcalni strežnik"
 
-#: ../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"
@@ -1724,58 +1508,56 @@ msgstr ""
 "\n"
 "Potem ponovno zaženite %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Prosim počakajte, iščem dostopne pakete..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Prosim počakajte, paketi se berejo iz baze..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Preverjam %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "spremembe:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Odstrani .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Uporabi .%s kot glavno datoteko"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ne naredi nič"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Namestitev je končana"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Preverjam..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Vsi zahtevani paketi so bili uspešno nameščeni."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Težava med namestitvijo"
 
-#: ../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"
@@ -1785,18 +1567,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Dostop do paketov vira ni mogoč."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ni možno dobiti paketov izvorne kode, oprostite. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1808,38 +1589,34 @@ msgstr ""
 "Javljene napake:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Namestitev paketov..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Nastavljam začetne nastavitve..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Namestitev paketov..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Zamenjajte medij"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prosim vstavite medij poimenovan \"%s\" v napravo [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Prenašam paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Preverjanje podpisov paketov..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1854,13 +1631,12 @@ msgstr ""
 "\n"
 "Želite nadaljevati namestitev?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Namestitev ni uspela"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1872,23 +1648,22 @@ msgstr ""
 "\n"
 "Mogoče bi želeli posodobiti bazo virov."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Pripravljam namestitev paketov..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Nameščam pakete `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "dostop do rpm datoteke [%s] ni mogoč"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1900,45 +1675,35 @@ msgstr ""
 "Ustvarjene so bile nekatere nastavitvene datoteke .rpmnew ali .rpmsave,\n"
 "lahko jih pregledate in se odločite za nadaljnja dejanja:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Ti paketi vsebujejo podatke o nadgradnji"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Več podatkov o paketu... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Noben paket za namestitev ni bil najden."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Nepopravljiva napaka: oprostite, ni mogoče najti nobenega paketa za "
 "namestitev."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Prosim počakajte, paketi se berejo iz baze..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Prosim počakajte, paketi se odstranjujejo..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Težave med odstranjevanjem"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1948,8 +1713,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1961,8 +1725,8 @@ msgstr ""
 "To orodje vam bo pomagalo izbrati programsko opremo, ki jo želite\n"
 "odstraniti s svojega računalnika."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1974,13 +1738,11 @@ msgstr ""
 "To orodje vam bo pomagalo, da namestite posodobitve\n"
 "na svoj računalnik."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Dobrodošli v orodju za nameščanje programov!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1994,214 +1756,172 @@ msgstr ""
 "paketov na CDROMu oz DVDju. To orodje vam bo pomagalo izbrati\n"
 "programsko opremo, ki jo želite namestiti na svoj računalnik."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Posodobitev programov"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux posodobitev"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Posodobitev programov"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Prosim vnesite podatke za dostop do posrednika (proxyja)\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Uporabniško ime:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Odstranjevanje paketov programske opreme"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Posodabljanje programskih paketov"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Namestitev programskih paketov..."
 
-#: ../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 "Informacije..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Avstrija"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Avstralija"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazilija"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Švica"
 
-#: ../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 "Češka"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Nemčija"
 
-#: ../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čija"
 
-#: ../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 "Francija"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Madž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 "Japonska"
 
-#: ../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 "Portugalska"
 
-#: ../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 "Združeno kraljestvo"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Kitajska"
 
-#: ../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 "Združene države"
 
-#: ../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"
@@ -2213,8 +1933,7 @@ msgstr ""
 "\n"
 "Nadaljevanje?"
 
-#: ../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"
@@ -2227,25 +1946,28 @@ msgstr ""
 "\n"
 "Nadaljevanje?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s izbire"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Prosim počakajte, prenašanje naslovov strežnikov."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Počakajte prosim, prenos naslovov zrcalnih strežnikov z Mandriva spletne "
 "strani"
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Napaka pri prenosu"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2259,8 +1981,8 @@ msgstr ""
 "Mreža ali spletna stran sta mogoče nedostopni.\n"
 "Prosim poskusite kasneje."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2274,18 +1996,15 @@ msgstr ""
 "Mreža oz. Mandriva spletna stran sta mogoče nedostopni.\n"
 "Prosim poskusite znova pozneje."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Ni zrcalnega strežnika"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Ni mogoče najti ustreznega strežnika."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2299,69 +2018,64 @@ msgstr ""
 "problem v tem, da arhitektura vašega procesorja ni podprta\n"
 "v uradnih posodobitvah (Mandriva Linux Official Updates)."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Prosim izberite željen zrcalni strežnik"
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiranje datoteke za vir `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Pregled datoteke vira `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Pregled oddaljene datoteke vira `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " opravljeno."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " neuspeh!"
 
 #. -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 iz vira %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Začenjam prenos iz `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Prenos `%s', preostanek časa:%s, hitrost:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Prenos `%s', hitrost:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Prosim počakajte, viri se obnavljajo ..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Napaka pri prenosu paketov"
 
-#: ../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"
@@ -2376,34 +2090,29 @@ msgstr ""
 "znova dodajte, tako da bo ponovno nastavljen, ali pa je vir trenutno "
 "nedostopen, v tem primeru poskusite pozneje."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Posodobi vire"
 
-#: ../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 "Izberite vire, ki jih želite posodobiti:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Izberi vse"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Posodobitev"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2415,8 +2124,8 @@ msgstr ""
 "Napake:\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"
@@ -2426,18 +2135,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Vira ni mogoče ustvariti"
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Neuspeh pri dodajanju vira"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2447,8 +2154,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"
@@ -2458,8 +2165,8 @@ msgstr ""
 "poganjate (%s).\n"
 "Zato bo onemogoč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"
@@ -2469,13 +2176,11 @@ msgstr ""
 "Mandriva Linuxa, ki jo poganjate (%s).\n"
 "Zato bo onemogočen."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Pomoč pognana v ozadju"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2751,6 +2456,18 @@ msgstr "Odstrani programsko opremo"
 msgid "Software Media Manager"
 msgstr "Upravitelj virov programske opreme"
 
+#~ msgid "Stop"
+#~ msgstr "Ustavi"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Vsi paketi po virih"
+
+#~ msgid "Normal information"
+#~ msgstr "Normalne informacije"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maksimalne informacije"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "vse je bilo pravilno nameščeno"
 
diff --git a/po/sq.po b/po/sq.po
index 7f6e1fe0..a6fbb313 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\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: 2002-11-27 21:45:+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -14,13 +15,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"
@@ -34,18 +33,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 "Azhurnimet normale"
 
-#: ../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,105 +59,88 @@ msgstr ""
 "\n"
 "A pajtoheni për të vazhduar?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Një moment ju lutemi, azhurnimi i burimeve..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Shtoje një burim"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Skedaret lokale"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Shtegu:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Serveri 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 "Serveri FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Serveri HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Mjet i lëvizshëm"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Shtegu apo pika montuese:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Mjet i lëvizshëm"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Shfletues..."
 
-#: ../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 "Parulla:"
 
-#: ../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 "Shtegu që ka të bëjë me 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 ""
 "Nëse e leni të zbrazta, sintezat/lista-hd do të verifikohet automatikisht"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Emri:"
 
 #: ../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 "Zgjedhni burimin të cilin dëshironi t'azhurnoni:"
 
-#: ../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 "Ju duhet ti mbushni më së paku dy hyrje të para."
 
-#: ../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 ""
 "Një burim tjetër ekziston me të njëjtin emër, a dëshironi\n"
 "me të vërtetë ta zëvendësoni atë?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Shtimi i një burimi:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Tip i burimit:"
 
@@ -181,10 +160,9 @@ msgstr "Tip i burimit:"
 #: ../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 "Anulo"
 
@@ -193,82 +171,74 @@ msgstr "Anulo"
 #: ../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 "Pregatitje për instalimin e pakove..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "asnjëherë"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Disa nga pakot nuk mund të instalohen"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Shkarkimi i `%s', shpejtësia:%s"
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Zhdukja e Pakove Software"
 
 #: ../edit-urpm-sources.pl:352
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 "A jeni i sigurt për zhdukjen e çelësit %s nga burimi %s?\n"
 "(emri i çelësit: %s)"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Një moment ju lutemi, zhdukja e burimit..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Botoje një burim"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Botimi i burimit \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Shpëtoi ndryshimet"
 
-#: ../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 "Ju duhet të futni burimin për të vazhduar më tutje"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
@@ -276,22 +246,19 @@ msgstr ""
 "lexues."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Konfigurimi i proxies"
 
 #: ../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,168 +267,139 @@ msgstr ""
 "(sintaksa është:<emri-i-makinës[:porta]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Emri i serverit proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Ju keni mundësi të përdorni një emër të përdoruesit/parullën për tu\n"
 "lidhur në serverin proxy"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Përdoruesi:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Shtoje një grup paralel"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Botoje grupin paralel"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Shtoni një burim të kufizuar"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Zgjedheni një burim për ta shtuar në një media të kufizuar:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Shtimi i një ftuesi"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Tip në emrin e ftuesit apo në adresën IP të ftuesit të shtuar:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Botimi i grupit paralel \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Emri i grupit:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokoli:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Burim i kufizuar:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Shtoje"
 
 #: ../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 "Zhduke"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Ftuesit:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfiguroje urpmi paralel (ekzekutim i shpërndarë për urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grupi"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokoli"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Medi e kufizuar"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokoli"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Urdhër"
 
-#: ../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 "(asnjë)"
 
-#: ../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 "Botues..."
 
-#: ../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 "Shtoje..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Menagjim i çelësave me nënshkrim digjital të pakove"
 
-#: ../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 "Burimi"
 
 #: ../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 "asnjë emër i gjetur, çelësi nuk ekziston në zilën rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Shtoje një çelës"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Zgjedheni një çelës për ta shtuar në një burim %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Zhduke çelësin"
 
 #: ../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)"
@@ -470,75 +408,65 @@ msgstr ""
 "(emri i çelësit: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Shtoje një çelës..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Zhduke çelësin"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Konfiguroje burimin"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Aktivizuar?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Azhurnimi"
 
-#: ../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 "Shtoje..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Azhurnimi..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Menagjimi i çelësave..."
 
-#: ../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 ""
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Ndihmë"
 
-#: ../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"
@@ -548,8 +476,7 @@ msgstr ""
 "\n"
 "A pajtoheni për të vazhduar?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -563,8 +490,7 @@ msgstr ""
 "ju dëshironi ti përdorni në kompjuterin tuaj. Ato do të ju mundësojnë\n"
 "instalimin e pakove të reja softver ose azhurnimin e tyre."
 
-#: ../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"
@@ -572,102 +498,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 "Përdorim: %s [OPCIONI...]"
 
-#: ../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 "Nisje në mod të përdoruesit"
 
-#: ../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"
@@ -677,634 +601,519 @@ msgstr ""
 "Ju nuk keni mundësi ti përmbushni ndryshimet në sistem, mirëpo\n"
 "ju mund ta vështroini ende bazën e të dhënave ekzistuese."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Mundësi për hyrje"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arkivimi"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Regjitrim"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Cd gdhendësi"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Compresim"
 
-#: ../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 "Tjetri"
 
-#: ../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 "Librat"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Libra për kompjuter"
 
-#: ../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
-#, 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 "Komunikimet"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Bazë e të dhënave"
 
-#: ../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 "Zhvillimi"
-
-#: ../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 "Zhvillimi"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME dhe GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE dhe Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Bërthama"
 
-#: ../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 "Botuesit"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Edukim"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Imituesit"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Vegla skedaresh"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Lojërat"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Aventurë"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Lojërat"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Boards"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Letrat"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Enigmat"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sportet"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategji"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Tryezë Grafike"
-
-#: ../rpmdrake:224
-#, c-format
+#: ../rpmdrake:235
 msgid "Enlightenment"
 msgstr "Ndriçimi"
 
-#: ../rpmdrake:225
-#, c-format
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+msgid "Graphical desktop"
+msgstr "Tryezë Grafike"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM i bazuar"
 
-#: ../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 "Grafike"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Vështrimi"
 
-#: ../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 "Punimi i rrjetit"
-
-#: ../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 "Punimi i rrjetit"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transferoje skedaren"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Lajmërim i çastit"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Mail"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Lajmet"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Hyrje të largëta"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Zyre"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publikimi"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Shkencat"
-
-#: ../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 "Shkencat"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologjia"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kimia"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Shkencë kompjuterike"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Gjeoshkencore"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematikët"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fizikët"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shellet"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Zëri"
 
-#: ../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 "Sistemi"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Bazuar"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Konfigurim"
+#: ../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 "Sistemi"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Boot dhe Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Konfigurim"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Paketim"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Stampimi"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Ndërtimi"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Ndërtimi"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Polisat"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Kosnola"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Polisat"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "Tip i vërtet"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Tip1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalizimi"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Bërthama dhe hardveri"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Bibliotekat"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Serverët"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminalet"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Vegla teksti"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Lodrat"
 
-#: ../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 "(I nxënë)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Kërkues i rezultateve"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Rezultatet e hetimeve (asnjë)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Një moment, hetimet në vazhdim e sipër..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Ndale"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Të reja"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Azhurnuar"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Të reja"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "I pa zgjedhur"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Zgjedhur"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "I pa zgjedhur"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Rëndësia: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Arësyja për azhurnim: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Asnjë përshkrim"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Skedaret:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Burimi: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Versioni i tanishëm i instaluar: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Emri: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versioni: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Madhësia: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Rëndësia: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Madhësia: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Titulli: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Arësyja për azhurnim: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Përshkrimi: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Asnjë përshkrim"
+#. 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ë shumë informacione mbi pakon..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Ju lutemi zgjedheni"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Një nga pakot vijuese është e nevojshme:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Ju lutemi zgjedheni"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Një moment ju lutemi, numërimi i pakove..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Asnjë azhurnim"
 
-#: ../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"
@@ -1314,29 +1123,24 @@ msgstr ""
 "asnjë nga pakot e instaluara, nuk janë azhurnuar në kompjuterin tuaj\n"
 "ose ju i keni instaluar më heret ato."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Gjitha"
 
 #. -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ë shumë informacione"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informacion mbi pakon"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Disa nga pakot e mbledhura duhet të zhduken"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1345,13 +1149,11 @@ msgstr ""
 "Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të zhduken:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Disa nga pakot nuk mund të zhduken"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1359,8 +1161,7 @@ msgstr ""
 "Zhdukja e këtyre pakove do të dëmtojë sistemin tuaj, kemi ndjesë:\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"
@@ -1370,13 +1171,11 @@ msgstr ""
 "tani:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Keni nevojë për pakot shtuese"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1386,18 +1185,17 @@ msgstr ""
 "instalohen:\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 "Disa nga pakot nuk mund të instalohen"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1407,123 +1205,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Disa pako duhet të zhduken"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Zgjedhur: %d MB / Hapësirë e lirë në disk: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Madhësia e zgjedhur: %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 "Azhurnimet e sigurisë"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Korigjimi i bug(it) azhurnues"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instaloje"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Azhurnimet normale"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instaloje"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mundësit 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 "Gjitha pakot, të radhitura simbas alfabetit"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Gjitha pakot, simbas grupit"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Gjitha pakot, simbas azhurnimit janë të lira"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Gjitha pakot, simbas madhësisë"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Gjitha pakot, e zgjedhura simbas gjendjes së tyre"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Gjitha pakot, simbas burimit të depozuar"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Gjitha pakot, simbas azhurnimit janë të lira"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Vetëm lejimet, të renditura simbas datës së instalimit"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Gjitha pakot, simbas grupit"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Azhurnimet normale"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Korigjimi i bug(it) azhurnues"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Azhurnimet normale"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Azhurnimet e sigurisë"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "mes emrave"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "mes përshkrimeve"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "mes emrave të skedareve"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Infomacion normale"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Infomacione maksimale"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Ju duhet ti zgjedhni disa pako në fillim."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Numër shumë i madhë i pakove të zgjedhura"
 
 #: ../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"
@@ -1540,7 +1323,7 @@ msgstr ""
 "A me të vërtetë dëshironi t'instaloni të gjitha pakot e zgjedhura?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1555,89 +1338,100 @@ msgstr ""
 "\n"
 "A dëshironi të vazhdoni?"
 
-#: ../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 "/_Skedare"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Azhurnim i burimit"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Vërja e zgjedhjeve në fillim"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Ringarkoje listën e pakove"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Braktise"
 
-#: ../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 "/_Opcionet"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Paraqiti automatikisht pakot e zgjedhura"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Ndihmë"
 
-#: ../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 "Azhurnimi 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 "Gjej:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Hulumto"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Pastro"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Instaloje"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Braktise"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Gabim fatal"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Një gabim fatal është paraqitur: %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"
@@ -1649,13 +1443,12 @@ msgstr ""
 "\n"
 "A dëshironi të vazhdoni?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Burimet azhurnuese veqse ekzistojnë"
 
-#: ../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"
@@ -1671,13 +1464,12 @@ msgstr ""
 "\n"
 "Dhe, riniseni %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Si ta zgjedhni pasqyrën tuaj vetë"
 
-#: ../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"
@@ -1691,58 +1483,56 @@ msgstr ""
 "\n"
 "Dhe, riniseni %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Një moment ju lutemi, leximi në pakot e bazës së të dhënave..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Inspektimi i %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "ndryshimet:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Zhduke .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Përdore .%s si skedare kryesore"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Asnjë veprim"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalimi përfundoi"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Inspektim..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Të gjitha pakot e zgjedhura janë instaluar si duhet."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Një problem është paraqitur gjatë instalimit"
 
-#: ../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"
@@ -1752,18 +1542,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "E pa mundur marrja e burimeve mbi pakot."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "E pa mundur marrja e burimeve mbi pakot, kemi ndjesë. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1775,38 +1564,34 @@ msgstr ""
 "Gabim(et) i(e) raportuar(a):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalimi i pakos..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicializimi..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalimi i pakos..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Ndrryshim i burimit"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ju lutemi futni emrin e burimit \"%s\" në mjetin [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Shkarkimi i pakos `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Verifikimi i nënshkrimeve të pakove..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1820,13 +1605,12 @@ msgstr ""
 "\n"
 "A dëshironi të vazhdoni?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalimi dështoi"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1838,23 +1622,22 @@ msgstr ""
 "\n"
 "A dëshironi ti azhurnoni burimet e bazës së të dhënave."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Pregatitje për instalimin e pakove..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalimi i pakos `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "e pa mundur hyrja në skedaren rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1866,43 +1649,33 @@ msgstr ""
 "Disa konfigurime të skedareve janë krijuar si `.rpmnew' ose `.rpmsave',\n"
 "ju mund ti verifikoni ato, që në fund të vendosni çfarë dëshironi të bëni: "
 
-#: ../rpmdrake: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 "Më shumë informacione mbi pakon..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Asnjë pako s'është gjetur për Instalim"
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gabim i pa mbuluar: asnjë pako e gjetur për instalim, kemi ndjesë."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Një moment ju lutemi, leximi në pakot e bazës së të dhënave..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Një moment ju lutemi, zhdukja pakove..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Një problem është paraqitur gjatë zhdukjes"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1912,8 +1685,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1925,8 +1697,8 @@ msgstr ""
 "Kjo vegël do të ju ndihmojë në zhdukjen e softverëve të dëshiruar nga "
 "kompjuteri juaj."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1938,13 +1710,11 @@ msgstr ""
 "Kjo vegël do të ju ndihmojë për intalimin e azhurnimeve të zgjedhura në\n"
 "kompjuterit tuaj."
 
-#: ../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"
@@ -1959,214 +1729,177 @@ msgstr ""
 "cilin\n"
 "sofver dëshironi ta instaloni në kompjuterin tuaj."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Zhdukja e Pakove Software"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Azhurnimi Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Zhdukja e Pakove Software"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Ju lutemi futni adresën tuaj e-mail këtu"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Emri i Përdoruesit:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Zhdukja e Pakove Software"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Zhdukja e Pakove Software"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalimi i Pakove Software"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Jo"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Po"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Infomacion..."
 
-#: ../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 "Belgjika"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazili"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Zvicërra"
 
-#: ../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 "Republika Çeke"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Gjermania"
 
-#: ../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 "Greqia"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spanja"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlanda"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Franca"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hungaria"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Izraeli"
 
-#: ../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 "Holanda"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvegjia"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapurit"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Sllovakia"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taivani"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Britania e Madhe"
 
-#: ../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 "Shtetet e Bashkuara"
 
-#: ../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"
@@ -2179,8 +1912,7 @@ msgstr ""
 "\n"
 "A pajtoheni për të vazhduar?"
 
-#: ../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"
@@ -2193,27 +1925,30 @@ msgstr ""
 "\n"
 "A pajtoheni për të vazhduar?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Një moment ju lutemi, shkarkimi i adresave të pasqyreve nga web siti "
 "Mandriva."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Një moment ju lutemi, shkarkimi i adresave të pasqyreve nga web siti "
 "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 "Gabim gjatë shkarkimit"
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2227,8 +1962,8 @@ msgstr ""
 "Rrjeti apo adresa web e Mandriva, e mundur të jenë të nxënë\n"
 "Ju lutemi provoni më vonë."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2242,18 +1977,15 @@ msgstr ""
 "Rrjeti apo adresa web e Mandriva, e mundur të jenë të nxënë\n"
 "Ju lutemi provoni më vonë."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Asnjë pasqyre"
 
-#: ../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"
@@ -2267,69 +1999,64 @@ msgstr ""
 "mbi të gjitha, arkitektura e procesorit tuaj nuk mundë të\n"
 "përkrahet nga Azhurnimi i Mandriva Linux Zyrëtar"
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Zgjedheni pasqyrën tuaj."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopjimi i skedares për burimin `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Verifikimi i skedarës së burimit `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Verifikimi i skedarës së largët të burimit `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " bërë."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " dështoi!"
 
 #. -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 për burimin %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Nisja e shkarkimit të `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Shkarkimi i `%s', koha e kaluar:%s, shpejtësia:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Shkarkimi i `%s', shpejtësia:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Një moment ju lutemi, azhurnimi i burimeve..."
 
-#: ../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"
@@ -2339,34 +2066,30 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Azhurnim i burimit"
 
-#: ../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 "Zgjedhni burimin të cilin dëshironi t'azhurnoni:"
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr "Zgjedhur"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Azhurnimi"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2378,26 +2101,25 @@ msgstr ""
 "Gabimet:\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 "I pa mundur krijimi i burimit."
 
-#: ../rpmdrake.pm:819
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "Një moment ju lutemi, shtimi i një burimi..."
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2407,29 +2129,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 "Ndihma është ngarkuar në ekranin e prapaskenës"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2705,6 +2425,18 @@ msgstr "Zhduke Softverin"
 msgid "Software Media Manager"
 msgstr "Menagjues i Burimit Softver"
 
+#~ msgid "Stop"
+#~ msgstr "Ndale"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Gjitha pakot, simbas burimit të depozuar"
+
+#~ msgid "Normal information"
+#~ msgstr "Infomacion normale"
+
+#~ msgid "Maximum information"
+#~ msgstr "Infomacione maksimale"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "gjdo gjë është instaluar si duhet"
 
diff --git a/po/sr.po b/po/sr.po
index d9950d78..8da49b31 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,7 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sr\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-02-01 19:31+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -20,13 +21,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.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"
@@ -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 "Обичне надоградње"
 
-#: ../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,104 +64,87 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../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
-#, 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 "Релативна путања ка 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?"
@@ -171,13 +152,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 "Тип медија:"
 
@@ -185,10 +164,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 "Одустани"
 
@@ -197,103 +175,92 @@ 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Download са `%s', брзина:%s"
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Уклањање пакета"
 
 #: ../edit-urpm-sources.pl:352
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 "Да ли сте сигурни да желите да уклоните кључ %s са медија %s?\n"
 "(име кључа: %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 ""
 
 #: ../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]>):"
@@ -302,166 +269,137 @@ msgstr ""
 "(синтакса: <proksi-domacin[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Име прокси домаћина(hostname):"
 
 #: ../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 "Додај host"
 
 #: ../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 "Hosts:"
 
 #: ../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!"
 
 #: ../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)"
@@ -470,75 +408,65 @@ 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
-#, 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 "Додај..."
 
-#: ../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"
@@ -548,8 +476,7 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -564,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"
@@ -573,102 +499,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 "Употреба: %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"
@@ -678,634 +602,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 "Backup"
 
-#: ../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 "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 "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 "Вести"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 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"
@@ -1316,29 +1124,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"
@@ -1348,13 +1151,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"
@@ -1362,8 +1163,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"
@@ -1373,13 +1173,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"
@@ -1389,18 +1187,17 @@ msgstr ""
 "да се инсталирају:\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 "Неки пакети не могу да се инсталирају"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1410,123 +1207,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 ""
 
-#: ../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 "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 "сортирани по датуму инсталације"
 
-#: ../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"
@@ -1543,7 +1325,7 @@ msgstr ""
 "Да ли заиста желите да инсталирате изабране пакете?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1557,89 +1339,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"
@@ -1651,13 +1444,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"
@@ -1674,13 +1466,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"
@@ -1694,58 +1485,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"
@@ -1755,18 +1544,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"
@@ -1778,38 +1566,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"
@@ -1823,13 +1607,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"
@@ -1841,23 +1624,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"
@@ -1869,43 +1651,33 @@ msgstr ""
 "Направио сам неке фајлове са подешавањима, пример `.rpmnew' или `.rpmsave',\n"
 "можете да их проверите како би сте нешто предузели:"
 
-#: ../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
-#, 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"
@@ -1915,8 +1687,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1928,8 +1699,8 @@ msgstr ""
 "Овај алат вам може помоћи да изаберете софтвер желите да уклоните са\n"
 "вашег рачунара."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1942,13 +1713,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"
@@ -1962,214 +1731,177 @@ msgstr ""
 "са програмима, на CD-у или DVD-у. Овај алат ће Вам помоћи да изаберете\n"
 "пакете које желите да инсталирате на Ваш рачунар."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, 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
+#, fuzzy
+msgid "Software Update"
+msgstr "Уклањање пакета"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Унесите своју email адресу доле"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 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
-#, 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"
@@ -2181,8 +1913,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"
@@ -2194,25 +1925,28 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Молим Вас сачекајте, скидам листу додатних адреса са Mandriva-овог веб сајта."
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2226,8 +1960,8 @@ msgstr ""
 "Интернет, или Mandriva-ов веб сајт можда нису тренутно доступни.\n"
 "Покушајте касније поново."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2241,18 +1975,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"
@@ -2266,69 +1997,64 @@ msgstr ""
 "случај да архитектура вашег процесора није подржана\n"
 "од стране Mandriva Linux Official 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
-#: ../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 "Покрећем 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', време до краја:%s, брзина:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download са `%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"
@@ -2338,34 +2064,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"
@@ -2377,26 +2098,25 @@ 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"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Не могу да направим медијум."
 
-#: ../rpmdrake.pm:819
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "Молимо Вас да сачекате, додајем медијум..."
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2406,29 +2126,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 ""
@@ -2704,6 +2422,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/sr@Latn.po b/po/sr@Latn.po
index 224d1319..e495e298 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -11,7 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sr\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-02-01 19:31+0100\n"
 "Last-Translator: Toma Jankovic_<webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -20,13 +21,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.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"
@@ -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 "Obične 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"
@@ -66,104 +64,87 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Molim Vas sačekajte, ažuriram medijum..."
 
-#: ../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 "Lokalni fajlovi"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Putanja:"
 
-#: ../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 "Prenosni uređaj"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Putanja ili tačka montiranja:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Prenosni uređaj"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Traži..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Prijava:"
 
-#: ../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 "Lozinka:"
 
-#: ../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 "Relativna putanja ka 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 "ukoliko ostavite prazno, synthesis/hdlist će biti automatski testirana"
 
-#: ../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 ""
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Izaberite medij koji želite da ažurirate:"
 
-#: ../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 "Morate da popunite 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?"
@@ -171,13 +152,11 @@ msgstr ""
 "VeKj postoji medij sa tim imenom, da li\n"
 "zaista želite da je zamenite?"
 
-#: ../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:"
 
@@ -185,10 +164,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"
 
@@ -197,103 +175,92 @@ 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Pripremam instalaciju paketa"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "uvek"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "nikad"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Neki paketi ne mogu da se instaliraju"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Download sa `%s', brzina:%s"
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Uklanjanje paketa"
 
 #: ../edit-urpm-sources.pl:352
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 "Da li ste sigurni da želite da uklonite ključ %s sa medija %s?\n"
 "(ime ključa: %s)"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Molimo Vas da sačekate, uklanjam medijum..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Izmeni medij"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Menjam medij \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Sačuvaj izmene"
 
-#: ../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 "Morate da ubacite medijum kako bi ste nastavili"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Da bi ste sačuvali izmene, morate da ubacite medijum u uređaj."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Podešavanje proksija"
 
 #: ../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]>):"
@@ -302,166 +269,137 @@ msgstr ""
 "(sintaksa: <proksi-domacin[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Ime proksi domaćina(hostname):"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Možete da podesite korisnika/lozinku za identifikaciju proksija:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Korisnik:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Doaj paralelnu grupu"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Uredite paralelnu grupu"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Dodaj limit za medij"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Izaberite medij za dodavanje u limit za medije:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Dodaj host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Unesite u ime hosta ili  IP adresu hosta za dodavanje:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Izmeni paralelnu grupu \"%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 "Limit 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 "Ukloni"
 
 #: ../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 "Podesite paralelni urpmi (distribuirano pokretanje 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 "Limit za medije"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Komanda"
 
-#: ../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 "(nijedan)"
 
-#: ../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 "Izmeni..."
 
-#: ../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 "Upravlja 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 keyring!"
 
 #: ../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 "Izaberi kljul koji treba dodati medijumu %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)"
@@ -470,75 +408,65 @@ 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 "Podešavanje medija"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Uključi?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Ažuriranje"
 
-#: ../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 "Dodaj..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Ažuriraj..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Uredi ključeve..."
 
-#: ../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 ""
 
-#: ../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"
@@ -548,8 +476,7 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -564,8 +491,7 @@ msgstr ""
 "na vašem računaru. Nakon toga će biti spremi za instalaciju kao novi paketi\n"
 "ili za ažuriranje starih."
 
-#: ../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"
@@ -573,102 +499,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 "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
-#, 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 "Pokrenuto 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"
@@ -678,634 +602,518 @@ msgstr ""
 "Nećete biti u mogućnosti da izvršite modifikacije na sistemu,\n"
 "ali možete da pretražujete postojeće baze podataka."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Dostupnost"
 
-#: ../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 "Narezivanje diskova"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Komresija"
 
-#: ../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 "Često postavljana pitanja"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Upustva"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../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 "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 "Razvoj"
-
-#: ../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 "Razvoj"
+
+#: ../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 "Učenje"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Alati za fajlove"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Igrice"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Avantura"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Igrice"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Forumi"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Karte"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Ukrštenice"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sportovi"
 
-#: ../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 "bazirano 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 "Monitoring"
 
-#: ../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 "Transfer fajlova"
 
-#: ../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 "Pošta"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Vesti"
 
-#: ../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 "Kancelarija"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Publikovanje"
 
-#: ../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 "Nauka o računarima"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Prirodne nauke"
 
-#: ../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 "Šelovi"
 
-#: ../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 "Boot i Init"
 
-#: ../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 "Hardver"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pakovanje"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Štampanje"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Razvoj"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Iskorištenje"
 
-#: ../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 bitmap"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internacionalizacija"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel i hardver"
 
-#: ../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 "Alati za tekst"
 
-#: ../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 "(Nije dostupno)"
 
-#: ../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 "Rezultat pretrage (nema)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Molim Vas 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 "Stop"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Mogu se dodati"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Mogu se ažurirati"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Mogu se dodati"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Nisu izabrani"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Izabrani"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Nisu izabrani"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Važnost: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Razlog ažuriranja:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Bez opisa"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fajlovi:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Izmene:\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 "Važnost: "
+#: ../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 ažuriranja:"
-
-#: ../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 "Dodatne informacije o paketu..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Izaberite"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Jedan od sledećih paketa je potreban:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Izaberite"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Molim Vas sačekajte, prikazujem pakete..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Bez ažuriranja"
 
-#: ../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"
@@ -1316,29 +1124,24 @@ msgstr ""
 "paketa za ažuriranje za vaš računar,\n"
 "ili su oni veKj instalirani."
 
-#: ../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 "Još 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 "Još neki paketi moraju biti uklonjeni"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1348,13 +1151,11 @@ msgstr ""
 "trebalo da se uklone:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Neki paketi se ne mogu ukloniti"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1362,8 +1163,7 @@ msgstr ""
 "Žalim, ali uklanjanjem ovih paketa bi ste oštetiti sistem:\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"
@@ -1373,13 +1173,11 @@ msgstr ""
 "da budu neizabrani:\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"
@@ -1389,18 +1187,17 @@ msgstr ""
 "da se instaliraju:\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 "Neki paketi ne mogu da se instaliraju"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1410,123 +1207,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Neki paketi moraju da se uklone"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izabrano: %d MB / Slobodan prostor na disku: %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 ""
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Sigurnosne nadogradnje"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Nadogradnje sa ispravkama"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Instaliraj"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Obične nadogradnje"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Instaliraj"
 
-#: ../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-ov izbor"
 
-#: ../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, po abecedi"
 
-#: ../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 nove verzije"
 
-#: ../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 biranja"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Svi paketi, po medijima"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Svi paketi, po dostupnosti nove verzije"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "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 "Obične nadogradnje"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Nadogradnje sa ispravkama"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Obične nadogradnje"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Sigurnosne nadogradnje"
+
+#: ../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 fajlova"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normalana informacija"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Potpuna informacija"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Prvo morate da odaberete neke pakete."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Izabrali ste 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"
@@ -1543,7 +1325,7 @@ msgstr ""
 "Da li zaista želite da instalirate izabrane pakete?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1557,89 +1339,100 @@ msgstr ""
 "\n"
 "da li je u redu da nastavim?"
 
-#: ../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 "/_Fajl"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Ažuriranje medij"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Ponovo izaberi"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/P_onovo učitaj listu paketa"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Kraj"
 
-#: ../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 "/_Opcije"
 
-#: ../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 "/_Pomoć"
 
-#: ../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 "Traži"
 
-#: ../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 "Kraj"
 
-#: ../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 "Pojavila se fatalna greška: %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"
@@ -1651,13 +1444,12 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Već postojići medij za ažuriranje"
 
-#: ../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"
@@ -1674,13 +1466,12 @@ msgstr ""
 "\n"
 "Zatim  restartujte  %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Kako ručno izabrati svoj miror sajt"
 
-#: ../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"
@@ -1694,58 +1485,56 @@ msgstr ""
 "\n"
 "Zatim, restarujte %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Molim Vas sačekajte, pronalazim dostupne pakete..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Molim vas sačekajte, učitavam bazu podataka o paketima..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Proveravam %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "izmene:"
 
-#: ../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 glavni fajl"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Ne radi ništa"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Instalacija gotova"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Proveri..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Svi paketi, koji ste zahtevali, su uspešno instalirani."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problem za vreme instaliranja"
 
-#: ../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"
@@ -1755,18 +1544,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, žao mi je. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1778,38 +1566,34 @@ msgstr ""
 "Prijavljena Greška(e):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Instalacija paketa..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicijalizacija..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Instalacija paketa..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Promeni medijum"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ubacite medijum sa imenom \"%s\" u uređaj [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Download-ujem pakete `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Provera potpisa na paketima..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1823,13 +1607,12 @@ msgstr ""
 "\n"
 "da li želite da nastavite instalaciju?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Instalacija neuspela"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1841,23 +1624,22 @@ msgstr ""
 "\n"
 "Možda želite da ažurirate bazu podataka za medije."
 
-#: ../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 da pristupim rpm datoteci [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1870,43 +1652,33 @@ msgstr ""
 "rpmsave',\n"
 "možete da ih proverite kako bi ste nešto preduzeli:"
 
-#: ../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 "Dodatne informacije o paketu..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nije pronađen paket za instalaciju."
 
-#: ../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."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Molim vas sačekajte, učitavam bazu podataka o paketima..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Molim Vas 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"
@@ -1916,8 +1688,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1929,8 +1700,8 @@ msgstr ""
 "Ovaj alat vam može pomoći da izaberete softver želite da uklonite sa\n"
 "vašeg računara."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1943,13 +1714,11 @@ msgstr ""
 "instalirate na\n"
 "vaš računar."
 
-#: ../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"
@@ -1963,214 +1732,177 @@ msgstr ""
 "sa programima, na CD-u ili DVD-u. Ovaj alat će Vam pomoći da izaberete\n"
 "pakete koje želite da instalirate na Vaš računar."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Uklanjanje paketa"
-
-#: ../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 "Uklanjanje paketa"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Unesite svoju email adresu dole"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Korisničko ime:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Uklanjanje paketa"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Uklanjanje paketa"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Instalacija 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 "Informacije..."
 
-#: ../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 "Švajcarska"
 
-#: ../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 "Nemač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 "Holandija"
 
-#: ../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 "Slavač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 "Sjedinjene Američke Države"
 
-#: ../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"
@@ -2182,8 +1914,7 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../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"
@@ -2195,25 +1926,28 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Molim Vas sačekajte, skidam listu dodatnih adresa sa Mandriva-ovog veb sajta."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Molim Vas sačekajte, skidam listu dodatnih adresa sa Mandriva-ovog veb sajta."
 
-#: ../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 tokom preuzimanja sa interneta"
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2227,8 +1961,8 @@ msgstr ""
 "Internet, ili Mandriva-ov veb sajt možda nisu trenutno dostupni.\n"
 "Pokušajte kasnije ponovo."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2242,18 +1976,15 @@ msgstr ""
 "Internet, ili Mandriva-ov veb sajt možda nisu trenutno dostupni.\n"
 "Pokušajte kasnije ponovo."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nema mirora"
 
-#: ../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"
@@ -2267,69 +1998,64 @@ msgstr ""
 "slučaj da arhitektura vašeg procesora nije podržana\n"
 "od strane Mandriva Linux Official Updates."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Izaberite sajt po želji."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiram fajl za medij `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Ispitujem fajl za medij `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ispitujem udaljeni fajl  za medij `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " urađeno."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " neuspelo!"
 
 #. -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 za medij %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Pokrećem download sa `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download sa `%s', vreme do kraja:%s, brzina:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download sa `%s', brzina:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Molim Vas sačekajte, ažuriram medijum..."
 
-#: ../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"
@@ -2339,34 +2065,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Ažuriranje medija"
 
-#: ../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 medij koji želite da ažurirate:"
 
-#: ../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 "Ažuriranje"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2378,26 +2099,25 @@ 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"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Ne mogu da napravim medijum."
 
-#: ../rpmdrake.pm:819
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "Molimo Vas da sačekate, dodajem medijum..."
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2407,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 "Pomoć 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 ""
@@ -2705,6 +2423,18 @@ msgstr "Ukloni softver"
 msgid "Software Media Manager"
 msgstr "Menadžer za Medije sa softverom"
 
+#~ msgid "Stop"
+#~ msgstr "Stop"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Svi paketi, po medijima"
+
+#~ msgid "Normal information"
+#~ msgstr "Normalana informacija"
+
+#~ msgid "Maximum information"
+#~ msgstr "Potpuna informacija"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "svi paketi su dobro instalirani"
 
diff --git a/po/sv.po b/po/sv.po
index 7c5ea03b..d77b72a1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -17,7 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sv - Mandriva 2007 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: 2006-04-01 19:24+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -26,13 +27,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Välj mediatyp"
 
-#: ../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 ""
 "officiella uppdateringar till din distribution. Du kan lägga till båda\n"
 "sortens källor, men du måste då göra det i två separata steg."
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Distributionskällor"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Officiella uppdateringar"
 
-#: ../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,85 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Vänta, lägger till media..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Lägg till media"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokala filer"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Sökväg:"
 
-#: ../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 "Flyttbar enhet"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Sökväg eller monteringspunkt:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Flyttbar enhet"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Bläddra..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Användarnamn:"
 
-#: ../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 "Lösenord:"
 
-#: ../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 sökväg till synthesis 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 "Om detta lämnas tomt kommer synthesis/hdlist automatiskt att undersökas"
+msgstr ""
+"Om detta lämnas tomt kommer synthesis/hdlist automatiskt att undersökas"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Namn:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Skapa media för en hel distribution"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Sök i detta media efter uppdateringar:"
 
-#: ../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 måste fylla i åtminstone de två första posterna."
 
-#: ../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 +166,11 @@ msgstr ""
 "Det finns redan ett media med det namnet.\n"
 "Vill du verkligen ersätta det?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Lägger till media:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Typ av media:"
 
@@ -202,10 +178,9 @@ msgstr "Typ av 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 "Avbryt"
 
@@ -214,100 +189,86 @@ msgstr "Avbryt"
 #: ../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 "Globala inställningar för paketinstallation..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "alltid"
 
 #: ../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 "Verifiera RPMer för installation:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Program för nedladdning:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Mediaborttagande"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Är du säker på att du vill ta bort media \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Vänta, tar bort media..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Redigera media"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Redigerar media \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: ../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 måste lägga i mediet för att fortsätta"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "För att kunna spara ändringarna måste du lägga i mediet i enheten."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Anpassa proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxyinställningar för media \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Globala proxyinställningar"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -316,139 +277,113 @@ msgstr ""
 "<proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxyvärddatornamn:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Du kan specificera ett användarnamn/lösenord för proxyautentiseringen:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Användare:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Lägg till en parallell grupp"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Redigera en parallell grupp"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Lägg till en mediagräns"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Välj ett media som ska läggas till i mediagränsen:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Lägg till en värddator"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Skriv in datornamnet eller IP-adressen för datorn som ska läggas till:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redigerar parallell grupp \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Gruppnamn:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Mediagräns:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Lägg till"
 
 #: ../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 "Ta bort"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Värddatorer:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ställ in parallell urpmi (distribuerad körning av urpmi)"
 
 #: ../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 "Mediagräns"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokoll"
+
 #: ../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 "(inget)"
 
-#: ../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 "Redigera..."
 
-#: ../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 "Lägg till..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Hantera nycklar för digitala signaturer för paket"
 
-#: ../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"
@@ -457,27 +392,24 @@ msgstr ""
 "Nycklar"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "inget namn hittat, nyckeln finns inte i RPM-nyckelring."
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Lägg till en nyckel"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Välj en nyckel för att lägga till media %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Ta bort en nyckel"
 
 #: ../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 +418,31 @@ msgstr ""
 "(nyckelns namn: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Lägg till en nyckel..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Ta bort nyckel"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Anpassa media"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Aktiverad?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Uppdateringar?"
 
-#: ../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 "Detta medium måste uppdateras för att vara användbart. Uppdatera 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 +452,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Lägg till anpassad..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Uppdatera..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Hantera nycklar..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parallell..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Globala inställningar"
 
-#: ../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 +487,7 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -582,8 +501,7 @@ msgstr ""
 "använda på datorn. De kommer sedan att att finnas tillgängliga när\n"
 "det är dags att installera nya programpaket eller utföra uppdateringar."
 
-#: ../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 +512,23 @@ msgstr ""
 "paketdatabasen (har du en annan pakethanterare på en annan\n"
 "arbetsyta, eller håller du redan på att installera paket?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Kan inte lägga till media, avsaknad av eller felaktiga argument."
 
-#: ../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 kommer nu lägga till ett nytt media med paket, %s.\n"
+"Du kommer att kunna installera ny programvara\n"
+"till ditt system från detta media."
+
+#: ../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 +538,22 @@ msgstr ""
 "Du kommer att kunna installera ny programvara\n"
 "till ditt system från detta media."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Installation av media %s lyckades."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Installation av media %s lyckades."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Användning: %s [FLAGGA]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -629,40 +561,37 @@ msgstr ""
 "  --changelog-first      visa ändringslogg före fillista i "
 "beskrivningsfönstret"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     begränsa till angivet media"
 
-#: ../rpmdrake:38
-#, c-format
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+#: ../rpmdrake:41
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     föreslå att sammanfoga alla .rpmnew/.rpmsave filer "
 "som hittas"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr "  --mode=MODE            välj läge (installera (förval), ta bort, uppdatera)"
+msgstr ""
+"  --mode=MODE            välj läge (installera (förval), ta bort, uppdatera)"
 
-#: ../rpmdrake:40
-#, c-format
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
-msgstr "  --no-confirmation      fråga inte efter bekräftelse i uppdateringsläge"
+#: ../rpmdrake:43
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+"  --no-confirmation      fråga inte efter bekräftelse i uppdateringsläge"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      uppdatera inte media vid start"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        verifiera inte paketsignaturer"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -670,33 +599,27 @@ msgstr ""
 "  --parallel=alias,host  välj parallellt läge, använd \"alias\" grupp, "
 "använd \"host\" värd för att visa nödvändiga beroenden"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    visa bara dessa paket"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      förvälj dessa paket"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 tvinga att köra som root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           kör sökning efter  \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Kör i användarläge"
 
-#: ../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 +629,517 @@ msgstr ""
 "Du kommer inte att kunna göra några förändringar i systemet.\n"
 "Du kan dock bläddra i den befintliga databasen."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Handikappstöd"
 
-#: ../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 "Säkerhetskopiering"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Cd-bränning"
 
-#: ../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 "Annan"
 
-#: ../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öcker"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Datorböcker"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Vanliga frågor"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Litteratur"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Kluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Meddelandehantering"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Kötjänster"
 
-#: ../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 "Utveckling"
-
-#: ../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 "Utveckling"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "Gnome och GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE och Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Kärna"
 
-#: ../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 "Editorer"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Utbildning"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulatorer"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Filverktyg"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Spel"
-
-#: ../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 "Spel"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkad"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Brädor"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kort"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzzel"
 
-#: ../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 "Grafiskt skrivbord"
-
-#: ../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 "Grafiskt skrivbord"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM-baserad"
 
-#: ../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 "Övervakning"
 
-#: ../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 "Nätverk"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Chatt"
 
-#: ../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 "Nätverk"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Filöverföring"
 
-#: ../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-post"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Fjärråtkomst"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Office"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Publika nycklar"
 
-#: ../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 "Vetenskap"
-
-#: ../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 "Vetenskap"
+
+#: ../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 "Datorvetenskap"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geovetenskap"
 
-#: ../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 "Skal"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../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 "Bas"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Inställningar"
+#: ../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 "Start och Init"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Inställningar"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Hårdvara"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Paketering"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Utskrift"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Spridning"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Spridning"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Teckensnitt"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Konsoll"
 
-#: ../rpmdrake:267
-#, c-format
+#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
+msgid "Fonts"
+msgstr "Teckensnitt"
+
+#: ../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 bitmapp"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Internationellt"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kärna och hårdvara"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Bibliotek"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Servrar"
 
-#: ../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 "Textverktyg"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Leksaker"
 
-#: ../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 tillgänglig)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Sökresultat"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Sökresultat (inget)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Vänta, söker..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Stoppa"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Kan läggas till"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Kan uppdateras"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Kan läggas till"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Inte vald"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Vald"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Inte vald"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Viktighet: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Orsak för uppdatering: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Ingen beskrivning"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Filer:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Ändringslogg:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Media: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Installerad version: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../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 "Storlek: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Viktighet: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Storlek: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Sammanfattning: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Orsak för uppdatering: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Beskrivning: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Ingen beskrivning"
+#. 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 "Mer information om paket..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Välj"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Ett av följande paket krävs:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Välj"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Vänta, listar paket..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Ingen uppdatering"
 
-#: ../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 +1149,24 @@ msgstr ""
 "det inte finns några tillgängliga uppdateringar för paketen\n"
 "som är installerade på systemet. Eller så har du redan installerat alla."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Alla"
 
 #. -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 "Mer information"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Information om paket"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Några ytterligare paket måste tas bort"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1374,13 +1175,11 @@ msgstr ""
 "På grund av deras beroenden måste följande paket också tas bort:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Vissa paket kan inte tas bort"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1388,8 +1187,7 @@ msgstr ""
 "Om du tar bort dessa paket kommer systemet att sluta fungera:\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"
@@ -1399,13 +1197,11 @@ msgstr ""
 "avmarkeras:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Ytterligare paket krävs"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1414,18 +1210,17 @@ msgstr ""
 "För att uppfylla beroenden måste följande paket också installeras:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (tillhör undantagslistan)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Vissa paket kan inte installeras"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1435,123 +1230,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Vissa paket måste tas bort"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valda: %d MB / ledigt diskutrymme: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Vald storlek: %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 "Ingen beskrivning tillgänglig för detta paket\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Säkerhetsuppdateringar"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Felrättningsuppdateringar"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Installera"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normala uppdateringar"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Installera"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr " %s val"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-val"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Alla paket, alfabetiskt"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Alla paket, efter grupp"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Alla paket, efter uppdateringstillgänglighet"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Alla paket, efter storlek"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Alla paket, efter valstatus"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Alla paket, efter medialagringsplats"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Alla paket, efter uppdateringstillgänglighet"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Ensamma paket; sorterat efter installationsdatum"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Alla paket, efter grupp"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normala uppdateringar"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Felrättningsuppdateringar"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normala uppdateringar"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Säkerhetsuppdateringar"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "i namn"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "i beskrivningar"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "i filnamn"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normal information"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Maximal information"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Du måste välja några paket först."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "För många paket är valda"
 
 #: ../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"
@@ -1568,7 +1348,7 @@ msgstr ""
 "Vill du verkligen installera alla valda paket?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1582,89 +1362,100 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../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 "/_Arkiv"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Uppdatera media"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/Å_terställ valet"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Ladda om _paketlistan"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/Av_sluta"
 
-#: ../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 "/_Inställningar"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Visa auto_matiskt valda paket"
 
-#: ../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 "Uppdatera 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 "Hitta:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Sök"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Töm"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Installera"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Allvarligt fel"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Ett allvarligt fel inträffade: %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"
@@ -1676,13 +1467,12 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Uppdateringsmedia som redan finns"
 
-#: ../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"
@@ -1697,13 +1487,12 @@ msgstr ""
 "\n"
 "Starta sedan om '%s'."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Hur du manuellt väljer en spegel"
 
-#: ../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"
@@ -1717,58 +1506,56 @@ msgstr ""
 "\n"
 "Starta sedan om %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Vänta, hittar tillgängliga paket..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Vänta, läser paketdatabas..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Undersöker %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "ändringar:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Ta bort .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Använd .%s som huvudfil"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Gör ingenting"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Installation slutförd"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Undersök..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Alla begärda paket installerades utan problem."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problem under 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"
@@ -1778,18 +1565,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Kunde inte hämta källpaket."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Kan inte hämta källpaket, %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1801,38 +1587,34 @@ msgstr ""
 "Fel rapporterade:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Paketinstallation..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Initierar..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Paketinstallation..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Byt media"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lägg i media med namn \"%s\" i enhet [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laddar ner paket \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Verifierar paketsignaturer..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1846,13 +1628,12 @@ msgstr ""
 "\n"
 "Vill du fortsätta med installationen?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Installationen misslyckades"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1864,23 +1645,21 @@ msgstr ""
 "\n"
 "Du kanske ska uppdatera din mediadatabas."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Förbereder paketinstallation..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerar paket \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "kan inte läsa rpm-fil [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1892,43 +1671,33 @@ msgstr ""
 "Några konfigurationsfiler skapades som \".rpmnew\" eller \".rpmsave\",\n"
 "du kan nu undersöka några för att vidta åtgärder:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Dessa paket kommer med uppgraderingsinformation"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Mer information om paket...[%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Inget paket hittat för installation."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Fel som ej går att reparera: inget paket hittat för installation."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Vänta, läser paketdatabas..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Vänta, tar bort paket..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problem vid borttag"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1938,8 +1707,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1951,8 +1719,8 @@ msgstr ""
 "Det här verktyget hjälper dig att välja vilka program du vill ta bort från\n"
 "datorn."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1964,13 +1732,11 @@ msgstr ""
 "Det här verktyget hjälper dig att välja uppdateringarna du vill\n"
 "installera på datorn."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Välkommen till verktyget för programinstallation!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1984,214 +1750,172 @@ msgstr ""
 "på cd-rom eller dvd. Det här verktyget hjälper dig att välja vilka program\n"
 "du vill installera på datorn."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Uppdatera Program"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Uppdatera Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Uppdatera Program"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Var vänlig ange dina uppgifter för att använda proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Användarnamn:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Paketborttag"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Uppdatera Paket"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Installation av mjukvarupaket"
 
-#: ../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 "Information..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Österrike"
 
-#: ../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 "Tjeckien"
 
-#: ../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 "Grekland"
 
-#: ../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 "Frankrike"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Ungern"
 
-#: ../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 "Nederländerna"
 
-#: ../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 "Ryssland"
 
-#: ../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 "Slovakien"
 
-#: ../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 "Amerikas förenta stater"
 
-#: ../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"
@@ -2203,8 +1927,7 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../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"
@@ -2216,23 +1939,26 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr " %s val"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Vänta, laddar ner spegeladresser."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Vänta, laddar ner spegeladresser från Mandrivas webbplats."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Fel vid nerladdning"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2246,8 +1972,8 @@ msgstr ""
 "Nätverket eller webbplatsen är kanske inte tillgängligt.\n"
 "Försök igen senare."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2261,18 +1987,15 @@ msgstr ""
 "Nätverket eller Mandrivas webbplats är kanske inte tillgängligt.\n"
 "Försök igen senare."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Ingen spegel"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Kan inte hitta en passande spegel."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2286,69 +2009,64 @@ msgstr ""
 "är att din processorarkitektur inte stöds av Mandriva Linux officiella "
 "uppdateringar."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Välj önskad spegel."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierar fil för media \"%s\"..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Undersöker fil för media \"%s\"..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Undersöker fjärrfil för media \"%s\"..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " klar."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " misslyckades."
 
 #. -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 från media %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Startar nedladdning av `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Nedladdnig av \"%s\", återstående tid:%s, hastighet:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Nedladdnig av \"%s\", hastighet:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Vänta, uppdaterar media..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Fel vid hämtning av paket"
 
-#: ../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"
@@ -2364,33 +2082,31 @@ msgstr ""
 "to reconfigure it, either it is currently unreachable and you should retry\n"
 "later."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Uppdatera media"
 
-#: ../rpmdrake.pm:722
-#, c-format
-msgid "No active medium found. You must enable some media to be able to update them."
-msgstr "Inget aktivt media hittades. Du måste aktivera något media för att kunna uppdatera dem."
+#: ../rpmdrake.pm:738
+msgid ""
+"No active medium found. You must enable some media to be able to update them."
+msgstr ""
+"Inget aktivt media hittades. Du måste aktivera något media för att kunna "
+"uppdatera dem."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Välj media du vill uppdatera:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Välj alla"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Uppdatera"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2402,8 +2118,8 @@ msgstr ""
 "Fel:\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 +2129,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Kan inte skapa media."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Fel vid tillägg av media"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2434,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"
@@ -2445,8 +2159,8 @@ msgstr ""
 "version av %s som du kör (%s).\n"
 "Detta media kommer att avaktiveras."
 
-#: ../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,14 +2170,13 @@ msgstr ""
 "version av Mandriva Linux som du kör (%s).\n"
 "Detta media kommer att avaktiveras."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Hjälp startad i bakgrunden"
 
-#: ../rpmdrake.pm:853
-#, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
+#: ../rpmdrake.pm:870
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr "Hjälpfönstret har startats, det bör synas på skrivbordet inom kort."
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -2736,6 +2449,18 @@ msgstr "Ta bort program"
 msgid "Software Media Manager"
 msgstr "Programhanterare för media"
 
+#~ msgid "Stop"
+#~ msgstr "Stoppa"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Alla paket, efter medialagringsplats"
+
+#~ msgid "Normal information"
+#~ msgstr "Normal information"
+
+#~ msgid "Maximum information"
+#~ msgstr "Maximal information"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "allt installerades utan problem"
 
@@ -2750,4 +2475,3 @@ msgstr "Programhanterare för media"
 
 #~ msgid "Everything installed successfully"
 #~ msgstr "Allt installerades utan problem"
-
diff --git a/po/ta.po b/po/ta.po
index a4654410..319beab3 100644
--- a/po/ta.po
+++ b/po/ta.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: 2002-08-31 16:35+0800\n"
 "Last-Translator: prabu anand <prabu_anand2000@yahoo.com>\n"
 "Language-Team: tamil <tamilinix@yahoogroups.com>\n"
@@ -17,13 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\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"
@@ -37,18 +36,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 "சாதரன புதுப்பித்தல்"
 
-#: ../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"
@@ -63,104 +61,88 @@ msgstr ""
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../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
-#, 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 "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 ""
 
-#: ../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?"
@@ -168,13 +150,13 @@ msgstr ""
 "இதே பெயரில் ஊடகம் ஒன்றுள்ளது,நீங்கள் \n"
 "நிச்சயமாக இதனை மாற்ற போகிறிர்களா?"
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:239
+#, fuzzy
 msgid "Adding a medium:"
 msgstr "புதிய மூலம் சேர்க்கப்படுகிறது"
 
-#: ../edit-urpm-sources.pl:244
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:241
+#, fuzzy
 msgid "Type of medium:"
 msgstr "மூலத்தின் வகை"
 
@@ -182,10 +164,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 "தவிர்"
 
@@ -194,101 +175,92 @@ 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 " `%s'  என்ற பொதியை நிறுவ முடியவில்ைல\n"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "`%s' இறக்கத்தின் ேவகம்:%s , "
 
 #: ../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
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "தயவுசெய்து காத்திருக்கவும்.... ஊடகம் நீக்கப்படுகிறது"
 
 #: ../edit-urpm-sources.pl:394
-#, fuzzy, c-format
+#, fuzzy
 msgid "Edit a medium"
 msgstr "மூலத்ைத திருத்தி அமை"
 
 #: ../edit-urpm-sources.pl:400
-#, fuzzy, c-format
+#, fuzzy, 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
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:422 ../edit-urpm-sources.pl:996
+#, fuzzy
 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]>):"
@@ -297,241 +269,208 @@ 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
-#, 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
-#, 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 "\"%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"
 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
-#, 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
-#, 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"
@@ -541,8 +480,8 @@ msgstr ""
 "\n"
 "இப்படியே தொடரலாமா?"
 
-#: ../edit-urpm-sources.pl:1010
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1024
+#, fuzzy
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -556,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"
@@ -565,736 +503,621 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
+#, fuzzy
 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 ""
 
-#: ../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 "Eசாளரம்"
 
-#: ../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 "Kசாளரமைப்பு"
 
-#: ../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 "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "உடனடித் தொடர்பு (messenger)"
 
-#: ../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 "rpmதொகுப்பு"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "அச்சு மேலாளர்"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 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 ""
 
-#: ../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
-#, fuzzy, 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
+#, fuzzy
+msgid "Not selected"
+msgstr "பொதிகளிடையே பிரச்சினைகள் எழுகிறது"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "தேர்வு ெசய்யப்பட்டுள்ளது"
 
-#: ../rpmdrake:523
-#, fuzzy, 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
+#, fuzzy
+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"
@@ -1304,29 +1127,25 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake:783 ../rpmdrake:788
+#, fuzzy
 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"
@@ -1336,13 +1155,12 @@ msgstr ""
 "வேண்டும்:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, fuzzy, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
+#, fuzzy
 msgid "Some packages can't be removed"
 msgstr " `%s'  என்ற பொதியை நிறுவ முடியவில்ைல\n"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1350,8 +1168,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"
@@ -1361,13 +1178,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"
@@ -1377,18 +1192,18 @@ msgstr ""
 "வேண்டும்:\n"
 "\n"
 
-#: ../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 " `%s'  என்ற பொதியை நிறுவ முடியவில்ைல\n"
 
-#: ../rpmdrake:823
-#, fuzzy, c-format
+#: ../rpmdrake:879
+#, fuzzy, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1397,123 +1212,114 @@ msgstr ""
 "மன்னிக்கவும், கீேழ ெகாடுக்கப்பட்டுள்ள பொதிகளை தேர்வுச் செய்ய முடியவில்ைல:\n"
 "\n"
 
-#: ../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 ""
 
-#: ../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
-#, fuzzy, c-format
-msgid "All packages, by group"
-msgstr "அனைத்து பொதிகளும்"
+#: ../rpmdrake:1007
+#, fuzzy
+msgid "All packages, by update availability"
+msgstr "புதுப்பிக்கப்பட வேண்டியவையின்படி"
 
-#: ../rpmdrake:972
-#, fuzzy, c-format
+#: ../rpmdrake:1008
+#, fuzzy
 msgid "All packages, by size"
 msgstr "அனைத்து பொதிகளும்"
 
-#: ../rpmdrake:973
-#, fuzzy, c-format
+#: ../rpmdrake:1009
+#, fuzzy
 msgid "All packages, by selection state"
 msgstr "தேர்வாகியுள்ளபடி"
 
-#: ../rpmdrake:977
-#, fuzzy, c-format
-msgid "All packages, by medium repository"
-msgstr "மூலங்களின் இருப்புப்படி"
-
-#: ../rpmdrake:978
-#, fuzzy, 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
+#, fuzzy
+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
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "கோப்புகளில்"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "சாதரன விவரம்"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "அதிகபட்ச விவரம்"
-
 #: ../rpmdrake:1098
-#, fuzzy, c-format
+#, fuzzy
 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"
@@ -1528,7 +1334,7 @@ msgstr ""
 "நீங்கள் இந்த எச்சரிக்கையை மீறி இவை அனைத்ைதயும் நிறுவ விரும்புகிறீர்களா?"
 
 #: ../rpmdrake:1117
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1542,89 +1348,101 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 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 ""
 
-#: ../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"
@@ -1636,13 +1454,13 @@ msgstr ""
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../rpmdrake:1295
-#, fuzzy, c-format
+#: ../rpmdrake:1323
+#, fuzzy
 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"
@@ -1652,13 +1470,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "உங்கள் இணைபதிப்ைப ைகமுைறயாக எப்படித் தேர்வுச் செய்வது"
 
-#: ../rpmdrake:1307
-#, fuzzy, c-format
+#: ../rpmdrake:1335
+#, fuzzy, 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"
@@ -1667,58 +1484,57 @@ 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 "சோதிக்கப்படுகிறது  %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
-#, 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"
@@ -1728,18 +1544,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "மூலப் பொதிகள் கிடைக்கவில்ைல"
 
-#: ../rpmdrake:1557
-#, fuzzy, c-format
+#: ../rpmdrake:1654
+#, fuzzy, 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"
@@ -1751,38 +1566,35 @@ msgstr ""
 "பிழை ேநர்ந்துள்ளது:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "துவக்கப்படுகிறது..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+#, fuzzy
+msgid "Package installation..."
+msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
+
+#: ../rpmdrake:1673
 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\" என்ற ஊடகத்ைத [%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
-#, fuzzy, c-format
+#: ../rpmdrake:1717
+#, fuzzy, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1796,13 +1608,12 @@ msgstr ""
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "நிறுவுதலில் பிழை நேர்ந்துள்ளது"
 
-#: ../rpmdrake:1630
-#, fuzzy, c-format
+#: ../rpmdrake:1727
+#, fuzzy, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1812,23 +1623,23 @@ msgstr ""
 "நிறுவுதலில் பிழை நேர்ந்துள்ளது சில கோப்புகள் கானப்படவில்ைல.\n"
 "உங்கள் மூலத்தரவுகளை புதுப்பித்து பாருங்கள்"
 
-#: ../rpmdrake:1645
-#, fuzzy, c-format
+#: ../rpmdrake:1742
+#, fuzzy
 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 ""
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1840,43 +1651,35 @@ msgstr ""
 "சில வடிவமைப்புக் கோப்புகள்  `.rpmnew அல்லது rpmsave',\n"
 "என்ற பெயர்களில் உருவாக்கப்பட்டது. அவற்ைறப் பார்த்து தேவையான நடவடிக்கை எடுக்கவும்"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:1833
+#, fuzzy
 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
-#, fuzzy, c-format
+#: ../rpmdrake:1870
+#, fuzzy, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1886,8 +1689,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1899,8 +1701,8 @@ msgstr ""
 "இக்கருவி மூலம் தேவையில்லாத ெமன்ெபாருளை உங்கள் கணினியில் இருந்து\n"
 " நீக்க முடியும்"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1912,13 +1714,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"
@@ -1931,214 +1731,178 @@ msgstr ""
 "இக்கருவி மூலம் தேவையான  ெமன்ெபாருளை உங்கள் கணினியில்\n"
 "நிறுவ முடியும்"
 
-#: ../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
-#, 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
-#, 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
-#, 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
-#, 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"
@@ -2150,8 +1914,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"
@@ -2163,23 +1926,26 @@ msgstr ""
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../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
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "பொதியை இறக்குவதில் பிழை நேர்ந்துள்ளது"
 
-#: ../rpmdrake.pm:524
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2193,8 +1959,8 @@ msgstr ""
 "நீங்கள் இணையத்தில் இல்லாதிருக்கலாம்;இல்ைல மாண்ட்ேரக் இணையதளத்தில்.\n"
 "பிரச்சினையிருக்கலாம்.தயவுசெய்து பிறகு முயற்சி செய்யவும்"
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2208,18 +1974,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"
@@ -2233,69 +1996,64 @@ msgstr ""
 "இணையத்தில் www.google.com சென்று தேடி\n"
 "பாருங்கள்"
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "தயவுசெய்து உங்களுக்கு அருகிலுள்ள இணைப்பதிப்ைப ேதர்ந்ெதடுங்கள்"
 
-#: ../rpmdrake.pm:618
-#, fuzzy, c-format
+#: ../rpmdrake.pm:634
+#, fuzzy, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s'... என்ற மூலத்திற்கு ேகாப்பு நகலிடப்படுகிறது"
 
-#: ../rpmdrake.pm:621
-#, fuzzy, c-format
+#: ../rpmdrake.pm:637
+#, fuzzy, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s'... என்ற நிரலின் மூலம் ஆராயப்படுகிறது"
 
-#: ../rpmdrake.pm:624
-#, fuzzy, c-format
+#: ../rpmdrake.pm:640
+#, fuzzy, 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 ""
 
-#: ../rpmdrake.pm:640
-#, fuzzy, c-format
+#: ../rpmdrake.pm:656
+#, fuzzy, 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"
@@ -2305,34 +2063,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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:784
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2340,26 +2096,25 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "தயவுசெய்து காத்திருக்கவும்.... புதிய ஊடகம் சேர்க்கப்படுகிறது"
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2369,29 +2124,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 ""
@@ -2667,6 +2420,19 @@ msgstr " ெமன்ெபாருளை நீக்கவும்"
 msgid "Software Media Manager"
 msgstr " ெமன்ெபாருள் மூலங்கள் மேலாளர்"
 
+#~ msgid "Stop"
+#~ msgstr "நிறுத்து"
+
+#, fuzzy
+#~ 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/tg.po b/po/tg.po
index 88f865a2..b60eeaf8 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -14,7 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-tg\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-17 16:32+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -23,13 +24,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,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 "Навигариҳои оддӣ"
 
-#: ../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"
@@ -69,106 +67,89 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../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
-#, 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 "Номи дохилӣ (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 "Гузарвожа:"
 
-#: ../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 +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 "Навъи сарчашма:"
 
@@ -190,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 "Бекор кардан"
 
@@ -202,102 +180,90 @@ 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
-#, 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "Фаровири `%s', суръат:%s"
 
 #: ../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,166 +272,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 keyring мавҷуд нест!"
 
 #: ../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)"
@@ -474,37 +411,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"
@@ -514,38 +446,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"
@@ -555,8 +482,7 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -572,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"
@@ -585,14 +510,24 @@ 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"
@@ -602,89 +537,80 @@ 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
-#, 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"
@@ -694,634 +620,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 "Қайди 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 "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 "Хадамотҳои Сафбасташуда"
 
-#: ../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 "Маърифат"
 
-#: ../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 "Навъи дуруст"
 
-#: ../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 "Changelog:\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"
@@ -1331,29 +1140,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"
@@ -1363,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"
@@ -1377,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"
@@ -1388,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"
@@ -1404,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"
@@ -1425,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 МБ / Фосилаи озоди диск: %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 ""
 
-#: ../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 "Танҳо боқимондаҳо, аз рӯи сана насби ба навъҳо ҷудо шуда"
 
-#: ../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"
@@ -1558,7 +1341,7 @@ msgstr ""
 "Шумо ҳақиқатан ҳамаи қуттиҳои интихобшударо коргузоштан мехоҳед?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1572,89 +1355,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"
@@ -1666,13 +1460,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"
@@ -1689,13 +1482,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"
@@ -1709,58 +1501,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"
@@ -1770,18 +1560,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"
@@ -1793,40 +1582,36 @@ 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"
@@ -1840,13 +1625,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"
@@ -1858,23 +1642,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"
@@ -1886,44 +1669,34 @@ msgstr ""
 "Баъзе файлҳои танзимдарорӣ ҳамчун `.rpmnew' ё `.rpmsave' офарида шуда\n"
 "буд, акнун метавонед баъзеашонро барои амалиётҳо бозрасӣ кунед:"
 
-#: ../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
-#, 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"
@@ -1933,8 +1706,7 @@ msgstr ""
 "\n"
 "%s "
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1946,8 +1718,8 @@ msgstr ""
 "Ин асбоб ба шумо барои интихоби нармафзор барои хориҷ аз компютери Шумо\n"
 "ёрӣ медиҳад."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1959,13 +1731,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"
@@ -1979,214 +1749,175 @@ msgstr ""
 "ё DVD пешниҳод карда мешавад. Ин асбоб ба шумо барои интихоби нармафзор\n"
 "барои коргузоштан ба компютери Шумо ёрӣ медиҳад."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Навсозии Бастаи Нармафзор"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Навигарии Mandriva Linux"
 
-#: ../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
-#, 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 "Singapore"
 
-#: ../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
-#, 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"
@@ -2198,8 +1929,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"
@@ -2211,23 +1941,26 @@ msgstr ""
 "\n"
 "Давом додан гирем?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr "Лутфан интизор шавед, фаровири адресҳои оинаҳо аз пойгоҳи Mandriva."
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2241,8 +1974,8 @@ msgstr ""
 "Шабака, ё пойгоҳи Mandriva, мумкин дастрас набошанд.\n"
 "Лутфан дертар такрор кунед."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2256,18 +1989,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"
@@ -2281,69 +2011,64 @@ msgstr ""
 "ҳолате ки сохти пардозандаи шумо бо Навигариҳои Расмии Mandriva Linux\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"
@@ -2358,34 +2083,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"
@@ -2398,8 +2118,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"
@@ -2409,18 +2129,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"
@@ -2430,8 +2148,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"
@@ -2441,8 +2159,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"
@@ -2452,13 +2170,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 +2453,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/th.po b/po/th.po
index 95df4832..442e5ca1 100644
--- a/po/th.po
+++ b/po/th.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: 2002-11-27 21:43+0700\n"
 "Last-Translator: Varokas Panusuwan <varokasp@hotmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,13 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\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"
@@ -37,18 +36,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 "อัพเดททั่วไป"
 
-#: ../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"
@@ -63,104 +61,88 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../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 "เพิ่ม source: "
 
-#: ../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 "พาธแบบ relative ไปยัง 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 ""
 
-#: ../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 "เลือก source(s) ที่คุณต้องการจะอัพเดท"
 
-#: ../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?"
@@ -168,13 +150,13 @@ msgstr ""
 "มีสื่อข้อมูลชื่อดังกล่าวอยู่แล้ว\n"
 "คุณต้องการจะเขียนทับหรือไม่?"
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:239
+#, fuzzy
 msgid "Adding a medium:"
 msgstr "เพิ่ม source:"
 
-#: ../edit-urpm-sources.pl:244
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:241
+#, fuzzy
 msgid "Type of medium:"
 msgstr "ชนิดของ source:"
 
@@ -182,10 +164,9 @@ msgstr "ชนิดของ source:"
 #: ../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 "ยกเลิก"
 
@@ -194,342 +175,298 @@ 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 "การ install package"
 
 #: ../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 "ไม่สามารถ install บางเพกเกจได้"
 
 #: ../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
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "กำลังเอาสื่อข้อมูลออก, กรุณารอสักครู่"
 
 #: ../edit-urpm-sources.pl:394
-#, fuzzy, c-format
+#, fuzzy
 msgid "Edit a medium"
 msgstr "แก้ไข source"
 
 #: ../edit-urpm-sources.pl:400
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "กำลังแก้ไข source \"%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 "Proxy..."
 
 #: ../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 "ปรับแต่ง proxies"
 
 #: ../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 "ถ้าคุณต้องการใช้ proxy กรุณาใส่ชื่อ host และ port (รูปแบบ: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "ชื่อโฮส proxy:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "คุณต้องใส่ล็อกอินและพาสเวิร์ดเพื่อใช้ proxy:"
 
 #: ../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
-#, fuzzy, c-format
+#, fuzzy
 msgid "Add a medium limit"
 msgstr "เพิ่ม source: "
 
 #: ../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 "กำลังแก้ไข source \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "ชื่อกลุ่ม:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
 #: ../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 "Protocol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocol"
+
 #: ../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 "ปรับแต่ง source"
 
-#: ../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
-#, 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"
@@ -539,8 +476,8 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../edit-urpm-sources.pl:1010
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:1024
+#, fuzzy
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -553,8 +490,7 @@ msgstr ""
 "เครื่องมือนี้จะช่วยคุณในการปรับแต่ง package sources ที่คุณจะใช้ในเครื่องคอมพิวเตอร์\n"
 "ของคุณ เพื่อที่เพกเกจเหล่านี้จะได้พร้อมสำหรับการ install หรืออัพเดทต่อไป"
 
-#: ../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"
@@ -562,736 +498,623 @@ 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
-#, 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
-#, 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 "Archiving"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Backup"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
+#: ../rpmdrake:207
+#, fuzzy
 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 ""
 
-#: ../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
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "อิมูเลเตอร์"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "File tools"
 
-#: ../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 "Adventure"
 
-#: ../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 "Puzzles"
 
-#: ../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 ""
 
-#: ../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 "กราฟิก"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Monitoring"
 
-#: ../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 "Instant messaging"
 
-#: ../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 "Publishing"
 
-#: ../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 "Biology"
 
-#: ../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 "Geosciences"
 
-#: ../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 "Shells"
 
-#: ../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 and 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
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "พัฒนาซอฟท์แวร์ (Development)"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "พัฒนาซอฟท์แวร์ (Development)"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "ฟอนส์"
-
-#: ../rpmdrake:266
-#, fuzzy, c-format
+#: ../rpmdrake:277
+#, fuzzy
 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 "Video"
 
-#: ../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
-#, fuzzy, 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 "Changelog:\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
+#, 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
-#, 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"
@@ -1300,29 +1123,25 @@ msgstr ""
 "ไม่มีรายการที่ต้องอัพเดท หมายความว่าอาจจะยังไม่มีอัพเดทสำหรัับ\n"
 "เพกเกจที่อยู่ในเครื่องของคุณหรือไม่ก็ถูก install หมดแล้ว"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
+#, fuzzy
 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"
@@ -1332,20 +1151,17 @@ 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"
 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"
@@ -1354,13 +1170,11 @@ msgstr ""
 "เนื่องจาก dependencies จากเพจเกจเหล่านี้ ทำให้ต้องเลือกออกตอนนี้:\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"
@@ -1369,18 +1183,17 @@ msgstr ""
 "เนื่องจาก dependencies, เพจเกจเหล่านี้จะต้อง install ไปด้วย:\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 "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../rpmdrake:823
-#, fuzzy, c-format
+#: ../rpmdrake:879
+#, fuzzy, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1389,123 +1202,114 @@ msgstr ""
 "เพกเกจเหล่านี้ไม่สามารถถูกเลือกได้:\n"
 "\n"
 
-#: ../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 ""
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "อัพเดทระบบรักษาความปลอดภัย"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "อัพเดทแบบแก้ไขบัก"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Install"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "อัพเดททั่วไป"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Install"
 
-#: ../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 choices"
 
-#: ../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
-#, fuzzy, c-format
-msgid "All packages, by group"
-msgstr "ทุกเพกเกจ,"
+#: ../rpmdrake:1007
+#, fuzzy
+msgid "All packages, by update availability"
+msgstr "ตามความพร้อมในการอัพเดท"
 
-#: ../rpmdrake:972
-#, fuzzy, c-format
+#: ../rpmdrake:1008
+#, fuzzy
 msgid "All packages, by size"
 msgstr "ทุกเพกเกจ,"
 
-#: ../rpmdrake:973
-#, fuzzy, c-format
+#: ../rpmdrake:1009
+#, fuzzy
 msgid "All packages, by selection state"
 msgstr "ตามการถูกเลือก"
 
-#: ../rpmdrake:977
-#, fuzzy, c-format
-msgid "All packages, by medium repository"
-msgstr "ตาม source repository"
-
-#: ../rpmdrake:978
-#, fuzzy, 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
+#, fuzzy
+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
-#, fuzzy, c-format
+#: ../rpmdrake:1072
+#, fuzzy
 msgid "in file names"
 msgstr "ในไฟล์"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "ข้อมูลแบบปกตื"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "ข้อมูลแบบละเอียด"
-
 #: ../rpmdrake:1098
-#, fuzzy, c-format
+#, fuzzy
 msgid "You need to select some packages first."
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
 #: ../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"
@@ -1521,7 +1325,7 @@ msgstr ""
 "คุณต้องการจะลงเพกเกจที่เลือกไว้ทั้งหมดหรือไม่?"
 
 #: ../rpmdrake:1117
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1535,89 +1339,104 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake:1151
+#, fuzzy
 msgid "/_Update media"
 msgstr "อัพเดท source(s)"
 
-#: ../rpmdrake:1165
-#, fuzzy, c-format
+#: ../rpmdrake:1161
+#, fuzzy
 msgid "/_Reset the selection"
 msgstr "reset รายชื่อที่ถูกเลือก"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
+#, fuzzy
 msgid "/_Show automatically selected packages"
 msgstr "  --อัตโนมัติ         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
 
-#: ../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 "Install"
+#: ../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"
@@ -1629,13 +1448,13 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อไปหรือไม่?"
 
-#: ../rpmdrake:1295
-#, fuzzy, c-format
+#: ../rpmdrake:1323
+#, fuzzy
 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"
@@ -1645,13 +1464,12 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "วิธีเลือก mirror ของคุณเอง"
 
-#: ../rpmdrake:1307
-#, fuzzy, c-format
+#: ../rpmdrake:1335
+#, fuzzy, 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"
@@ -1664,58 +1482,57 @@ msgstr ""
 "\n"
 "จากนั้น ก็ปิดแล้วเปิด Mandriva LinuxUpdate อีกครั้ง"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:1551
+#, fuzzy
 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 เป็นไฟล์หลักManager"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "ไม่ต้องทำอะไร"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "install เสร็จเรียบร้อย"
 
-#: ../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 "เพกเกจทุกตัวที่เลือกไว้ถูก install เรียบร้อย"
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "เกิดปัญหาขณะ install"
 
-#: ../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"
@@ -1725,18 +1542,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
-#: ../rpmdrake:1557
-#, fuzzy, c-format
+#: ../rpmdrake:1654
+#, fuzzy, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1744,38 +1560,35 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1567
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "การ install package"
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr ""
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+#, fuzzy
+msgid "Package installation..."
+msgstr "การ install package"
+
+#: ../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 ""
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1620
-#, fuzzy, c-format
+#: ../rpmdrake:1717
+#, fuzzy, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1789,13 +1602,12 @@ msgstr ""
 "\n"
 "คุณต้องการทำต่อหรือไม่?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "install ไม่สำเร็จ"
 
-#: ../rpmdrake:1630
-#, fuzzy, c-format
+#: ../rpmdrake:1727
+#, fuzzy, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1805,23 +1617,23 @@ msgstr ""
 "install ไม่สำเร็จ, ไฟล์บางไฟล์อยู่ไท่ครบ\n"
 "คุณอาจจะต้องอัพเดทฐานข้อมูล source ของคุณ"
 
-#: ../rpmdrake:1645
-#, fuzzy, c-format
+#: ../rpmdrake:1742
+#, fuzzy
 msgid "Preparing packages installation..."
 msgstr "การ install package"
 
-#: ../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 "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1833,43 +1645,35 @@ msgstr ""
 "ไฟล์ configuration บางตัวถูกสร้างในชื่อ '.rpmnew' หรือ '.rpmsave', \n"
 "คุณอาจจะต้องตรวจสอบไฟล์เหล่านี้หากต้องการทำอย่างอื่นต่อไป"
 
-#: ../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 "การ install package"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake:1869
+#, fuzzy
 msgid "Problem during removal"
 msgstr "เกิดปัญหาขณะ install"
 
-#: ../rpmdrake:1821
-#, fuzzy, c-format
+#: ../rpmdrake:1870
+#, fuzzy, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1879,8 +1683,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1891,8 +1694,8 @@ msgstr ""
 "\n"
 "โปรแกรมนี้จะช่วยคุณในการเลือกโปรแกรมที่คุณต้องการลบออกจากเครื่อง"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1903,13 +1706,11 @@ msgstr ""
 "\n"
 "โปรแกรมนี้จะช่วยคุณในการเลือกตัวอัพเดทที่คุณต้องการ install ลงในเครื่อง"
 
-#: ../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"
@@ -1923,214 +1724,180 @@ msgstr ""
 "บน CDROM หรือ DVD  โปรแกรมนี้จะช่วยคุณเลือกว่าโปรแกรทไหนที่คุณต้องการ\n"
 "จะลงบนเครื่อง"
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "การลบเพกเกจ"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "อัพเดทของ Mandriva Linux"
 
-#: ../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 "กรุณาใส่ ประโยคลับสำหรับ %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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "การลบเพกเกจ"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "การ install package"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:386
+#, fuzzy
 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:396
+#, fuzzy
 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:408
+#, fuzzy
 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
-#, 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"
@@ -2142,8 +1909,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"
@@ -2155,23 +1921,26 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr "กรุณารอสักครุ่, กำลังดาว์นโหลดรายชื่อ mirrors จากเวป Mandriva"
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "กรุณารอสักครุ่, กำลังดาว์นโหลดรายชื่อ mirrors จากเวป 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:539
+#, fuzzy, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2184,8 +1953,8 @@ msgstr ""
 "%s\n"
 "ระบบเนตเวิร์ก หรือ เวป Mandriva ในขณะนี้อาจจะไม่พร้อมให้บริการ กรุณาลองใหม่ภายหลัง"
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2198,18 +1967,15 @@ msgstr ""
 "%s\n"
 "ระบบเนตเวิร์ก หรือ เวป Mandriva ในขณะนี้อาจจะไม่พร้อมให้บริการ กรุณาลองใหม่ภายหลัง"
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "ไม่พบ 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"
@@ -2222,69 +1988,65 @@ msgstr ""
 "ปัญหานี้เกิดได้จากหลายสาเหตุ; ส่วนมากแล้วจะมาจากการที่ architecture ของ\n"
 "หน่วยประมวลผลของคุณไม่ได้สนับสนุนโดย Mandriva Linux Offical Updates"
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "กรุณาเลือก mirror ที่ต้องการ"
 
-#: ../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 "ในไฟล์"
 
 #. -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"
@@ -2294,34 +2056,32 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, fuzzy, c-format
+#: ../rpmdrake.pm:733
+#, fuzzy
 msgid "Update media"
 msgstr "อัพเดท source(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 ""
 
-#: ../rpmdrake.pm:729
-#, fuzzy, c-format
+#: ../rpmdrake.pm:745
+#, fuzzy
 msgid "Select the media you wish to update:"
 msgstr "เลือก source(s) ที่คุณต้องการจะอัพเดท"
 
-#: ../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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:784
+#, fuzzy, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2329,26 +2089,25 @@ 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:835
+#, fuzzy
 msgid "Failure when adding medium"
 msgstr "กำลังเพิ่มแผ่นข้อมูล, กรุณารอสักครู่"
 
-#: ../rpmdrake.pm:820
-#, fuzzy, c-format
+#: ../rpmdrake.pm:836
+#, fuzzy, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2358,29 +2117,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 ""
@@ -2656,6 +2413,19 @@ msgstr "ลบโปรแกรท"
 msgid "Software Media Manager"
 msgstr "Software Media Manager"
 
+#~ msgid "Stop"
+#~ msgstr "หยุด"
+
+#, fuzzy
+#~ msgid "All packages, by medium repository"
+#~ msgstr "ตาม source repository"
+
+#~ msgid "Normal information"
+#~ msgstr "ข้อมูลแบบปกตื"
+
+#~ msgid "Maximum information"
+#~ msgstr "ข้อมูลแบบละเอียด"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "ทุกอย่างถูก install เรียบร้อย"
 
diff --git a/po/tl.po b/po/tl.po
index d04c9cc5..695ca56f 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-tl\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-05 01:18+0000\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salin@pandaypinoy.org>\n"
@@ -15,13 +16,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 "Piliin ang uri ng 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"
@@ -48,18 +47,16 @@ msgstr ""
 "ninyong idagdag pareho ngunit kailangan ninyong gawin ito sa dalawang "
 "hakbang.)"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Mga source ng distribusyon"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Mga opisyal na update"
 
-#: ../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,86 @@ msgstr ""
 "\n"
 "Ayos lang ba na magpatuloy?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Pakihintay, idinadagdag ang media..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Magdagdag ng medium"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Mga local file"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Path/Landas:"
 
-#: ../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 "Naaalis na device"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Path/Landas o mount point:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Naaalis na device"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "I-browse..."
 
-#: ../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 "Relative path patungong 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 "Kung iwang blangko, automatic na susuriing mabuti ang synthesis/hdlist"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Pangalan:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Gumawa ng media para sa buong distribusyon"
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Piliin ang media na nais mong i-update:"
 
-#: ../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 "Kailangan mong punuin ang unang dalawang entry."
 
-#: ../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 +163,11 @@ msgstr ""
 "Mayroon nang medium na may ganong pangalan,\n"
 "gusto mo ba talagang palitan iyon?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Nagdadagdag ng medium:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Uri ng medium:"
 
@@ -198,10 +175,9 @@ msgstr "Uri ng 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 "I-cancel"
 
@@ -210,102 +186,87 @@ msgstr "I-cancel"
 #: ../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 "Pangkalahatang option para sa pag-install ng package"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "parati"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "hindi kailanman"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Siguruhin ang mga RPM na ii-install:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Program na pang-download na gagamitin:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Pagtanggal ng Source"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Sigurado kang gusto mong alisin ang source na \"%s\"?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Pakihintay, inaalis ang medium..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Mag-edit ng medium"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Ini-edit ang medium na \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "I-save ang mga pagbabago"
 
-#: ../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 "Kailangan mong isuksok ang medium para magpatuloy"
 
 #: ../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 mai-save ang mga pagbabago, kailangan mong isuksok ang medium sa drive."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "I-configure ang mga proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Setting ng proxy para sa media na \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Pangkalahatang setting ng 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 +275,137 @@ msgstr ""
 "(syntax: <proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy hostname:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Maaari kang magbanggit ng user/password para sa proxy authentication:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "User:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Magdagdag ng parallel na grupo"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Mag-edit ng parallel na grupo"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Magdagdag ng medium limit"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Pumili ng medium para sa pagdadagdag sa media limit:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Magdagdag ng host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "I-type ang hostname o IP address ng host na idadagdag:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Ini-edit ang parallel na grupo na \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Pangalan ng grupo:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Media limit:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Idagdag"
 
 #: ../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 "Alisin"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Mga host:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "I-configure ang parallel urpmi (\"distributed execution\" ng urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grupo"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protocol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Media limit"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Command"
 
-#: ../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 "(wala)"
 
-#: ../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 "I-edit..."
 
-#: ../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 "Idagdag..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "I-manage ang mga key para sa digital signature ng package"
 
-#: ../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 ""
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "walang nahanap na pangalan, walang key sa rpm keyring!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Magdagdag ng key"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Pumili ng key para sa pagdadagdag sa medium na %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Mag-alis ng 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)"
@@ -482,37 +414,32 @@ msgstr ""
 "(pangalan ng key: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Magdagdag ng key..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Alisin ang Key"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "I-configure ang media"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Gumagana?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "I-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"
@@ -522,38 +449,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Magdagdag ng sadya..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "I-update..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "I-manage ang mga key..."
 
-#: ../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 "Pangkalahatang option..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Tulong"
 
-#: ../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 +484,7 @@ msgstr ""
 "\n"
 "Ok lang ba na magpatuloy?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -579,8 +499,7 @@ msgstr ""
 "available sila para mag-install ng bagong software package o magsagawa ng\n"
 "mga update."
 
-#: ../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"
@@ -592,13 +511,23 @@ msgstr ""
 "(mayroon ka bang ibang media manager sa ibang desktop o\n"
 "ikaw ay kasalukuyang nag-i-install din ng mga package?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Hindi maidagdag ang medium, maling o nawawalang mga argument"
 
-#: ../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 ""
+"Ikaw ay magdadagdag ng bagong medium ng mga package, `%s'.\n"
+"Iyon ay nangangahulugang ikaw ay makapagdadagdag ng mga\n"
+"bagong software package sa iyong sistema mula sa bagong medium na iyon."
+
+#: ../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,91 +537,84 @@ msgstr ""
 "Iyon ay nangangahulugang ikaw ay makapagdadagdag ng mga\n"
 "bagong software package sa iyong sistema mula sa bagong medium na iyon."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Matagumpay na naidagdag ang medium na `%s'."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Matagumpay na naidagdag ang medium na `%s'."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Paggamit: %s [OPTION]..."
 
-#: ../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       - i-update ang update media lamang.\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"
 "                      Ulat ng DrakBackup Daemon\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 "Tumatakbo sa user mode"
 
-#: ../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"
@@ -702,634 +624,518 @@ msgstr ""
 "Ikaw ay hindi makakagawa ng pagbabago sa sistema, pero\n"
 "maaari mong i-browse ang database na mayroon."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Accessibility"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Pang-Archive"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Pang-Backup"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Cd burning"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Pang-Compress"
 
-#: ../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 "Iba pa"
 
-#: ../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 "Aklat"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Aklat sa Computer"
 
-#: ../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 "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 "Pagpasa ng Mensahe"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Serbisyong Panghanay"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Komunikasyon"
 
-#: ../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 "Paglilinang"
-
-#: ../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 "Paglilinang"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME at GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE at 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 "Pang-edit"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Edukasyon"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulator (manggagaya)"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Kasangkapang pang-file"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Laro"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Pakikipagsapalaran"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Laro"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Board"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Baraha"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Palaisipan"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sports"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strategy"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Graphical na 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 "Graphical na desktop"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM nakabatay"
 
-#: ../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 "Graphics"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Pagmamanman"
 
-#: ../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 "Pagne-Network"
-
-#: ../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 "Pagne-Network"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Paglilipat ng file"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Instant Messaging (IM)"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Liham"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Malayuang access"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Opisina"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Pampublikong Susi"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Paglilimbag"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Agham"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomy"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Agham"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biology"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Chemistry"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Agham pang-computer"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geosciences"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Mathematics"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Physics"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Tunog"
 
-#: ../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 "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 "Sistema"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Boot at Init"
 
-#: ../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 "Hardware"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Pagpa-Package"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Pagpi-print"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Pagkalat"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Pagkalat"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Font"
-
-#: ../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 "Font"
+
+#: ../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 "Internationalization"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel at hardware"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Library"
 
-#: ../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 "Terminal"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Kasangkapang pang-text"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Laruan"
 
-#: ../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 "(Hindi available)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Resulta ng paghahanap"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Resulta ng paghahanap (wala)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Pakihintay, naghahanap..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Hinto"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Maidadagdag"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Maa-upgrade"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Maidadagdag"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Hindi napili"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Napili"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Hindi napili"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Kahalagahan: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Dahilan para sa update: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "sa mga paglalarawan"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Mga file:\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 "Kasalukuyang naka-install na version: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Pangalan: "
 
-#: ../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 "Laki: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Kahalagahan: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Laki: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Kabuuan: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Dahilan para sa update: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Paglalarawan: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "sa mga paglalarawan"
+#. 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 "Mas maraming inpormasyon sa package..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Pumili ka"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Isa sa mga sumusunod na package ay kinakailangan:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Pumili ka"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Pakihintay, nililista ang mga package..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Walang update"
 
-#: ../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"
@@ -1339,29 +1145,24 @@ msgstr ""
 "(1) walang available na update para sa mga package na naka-install sa\n"
 "computer mo; o (2) in-install mo na silang lahat."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Lahat"
 
 #. -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 "Mas maraming inpormasyon"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Inpormasyon sa mga package"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Ilang karagdagang mga package ay kailangang alisin"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1371,13 +1172,11 @@ msgstr ""
 "kailangan ding alisin:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Ilang mga package ay hindi maalis"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1385,8 +1184,7 @@ msgstr ""
 "Kapag inalis itong mga package ay masisira ang sistema mo, sorry:\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"
@@ -1396,13 +1194,11 @@ msgstr ""
 "dapat di-piliin ngayon:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Mga karagdagang package na kinakailangan"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1412,18 +1208,17 @@ msgstr ""
 "package ay kailangan ding i-install:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (nauukol sa talaan ng lalaktawan)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Ilang mga package ay hindi ma-install"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1433,123 +1228,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Ilang mga package ay kailangang alisin"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Napili: %d MB / Libreng puwang sa disk: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Laki ng napili: %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 "Hindi available ang paglalarawan para sa package na ito\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Mga update pangseguridad"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Mga bugfix update"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "I-install"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Mga normal update"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "I-install"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s na pagpipilian"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Mga Pili ng 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 "Lahat ng package, alphabetical"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Lahat ng package, ayon sa grupo"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Lahat ng package, ayon sa pagkakaroon ng update"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Lahat ng package, ayon sa laki"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Lahat ng package, ayon sa lagay ng pagpili"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Lahat ng package, ayon sa lagakan ng medium"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Lahat ng package, ayon sa pagkakaroon ng update"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Mga dahon lang, inayos ayon sa petsa ng install"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Lahat ng package, ayon sa grupo"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Mga normal update"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Mga bugfix update"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Mga normal update"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Mga update pangseguridad"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "sa mga pangalan"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "sa mga paglalarawan"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "sa mga pangalan ng file"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normal na inpormasyon"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Pinakamaraming inpormasyon"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Kailangan mo munang mamili ng ilang mga package."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Sobrang daming package ang pinili"
 
 #: ../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"
@@ -1566,7 +1346,7 @@ msgstr ""
 "Gusto mo ba talagang i-install lahat ng mga piniling package?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1580,89 +1360,100 @@ msgstr ""
 "\n"
 "Ok lang ba na magpatuloy?"
 
-#: ../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
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/I-_Update ang media"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/I-_Reset ang pagpipilian"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/I-Load ulit ang talaan ng mga _package"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/_Labas"
 
-#: ../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 "/Mga _Option"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Ipa_kita kaagad ang mga napiling package"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Tulong"
 
-#: ../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 "Hanapin:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Maghanap"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "I-clear"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "I-install"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Quit"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Fatal error"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "May nangyaring fatal error: %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 +1466,12 @@ msgstr ""
 "\n"
 "Ok lang ba na magpatuloy?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Mayroon nang update media"
 
-#: ../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"
@@ -1697,13 +1487,12 @@ msgstr ""
 "\n"
 "Pagkatapos, simulan muli ang %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Paano piliin ng mano-mano ang mirror mo"
 
-#: ../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"
@@ -1717,58 +1506,56 @@ msgstr ""
 "\n"
 "Pagkatapos, simulan muli ang %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Pakihintay, naghahanap ng mga available na package..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Pakihintay, binabasa ang database ng mga package..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Sinisiyasat ang %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "mga pagbabago:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Alisin ang .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Gamitin ang .%s bilang main file"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Walang gawin"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Natapos na ang pag-install"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Siyasatin..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Lahat ng hiniling na package ay matagumpay na na-install."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Problema habang nag-i-install"
 
-#: ../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"
@@ -1778,18 +1565,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Hindi makuha ang mga source package."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Hindi makuha ang mga source package, sorry. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1801,38 +1587,34 @@ msgstr ""
 "Iniulat na error:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Pag-i-install ng package..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Ini-initialize..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Pag-i-install ng package..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Baguhin ang medium"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Pakisuksok ang medium na may pangalan na \"%s\" sa device na [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Dina-download ang package na `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Pinapatotohanan ang mga signature ng package..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1846,13 +1628,12 @@ msgstr ""
 "\n"
 "Gusto mong ituloy ang pag-i-install?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Nabigo ang pag-i-install"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1864,23 +1645,22 @@ msgstr ""
 "\n"
 "Baka gusto mong i-update ang iyong database ng media."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Hinahanda ang pag-i-install ng mga package..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Ini-install ang package na `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "hindi ma-access ang rpm file [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1892,44 +1672,34 @@ msgstr ""
 "Ilang mga configuration file ay ginawa bilang `.rpmnew' o `.rpmsave',\n"
 "maaari mo ngayong siyasatin ang ilan para makagawa ng mga aksyon:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Ang mga package na ito ay may kasamang inpormasyong pang-upgrade"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Mas maraming inpormasyon sa package... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Walang nahanap na package para sa pag-i-install."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Di-nababawing error: walang nahanap na package para sa pag-i-install, sorry."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Pakihintay, binabasa ang database ng mga package..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Pakihintay, inaalis ang mga package..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Problema habang nag-aalis"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1939,8 +1709,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1952,8 +1721,8 @@ msgstr ""
 "Ang kasangkapang ito ay tutulong sa iyong pumili kung aling software\n"
 "ang gusto mong alisin mula sa computer mo."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1965,13 +1734,11 @@ msgstr ""
 "Ang kasangkapang ito ay tutulong sa iyong pumili ng mga update na\n"
 "gusto mong i-install sa computer mo."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Maligayang pagdating sa kagamitang pang-install ng software!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1985,214 +1752,174 @@ msgstr ""
 "package sa CDROM o DVD. Ang kasangkapang ito ay tutulong sa iyong pumili\n"
 "kung aling software ang gusto mong i-install sa computer mo."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Update ng 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
+msgid "Software Update"
+msgstr "Update ng Software"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Pakipasok ang inyong email address sa ilalim "
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Username:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Pag-aalis ng mga Software Package"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Mga Update ng Software Package"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Pag-i-install ng mga Software Package"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Hindi"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Oo"
 
-#: ../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 "Belgium"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: ../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 "Czech Republic"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Germany"
 
-#: ../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 "Greece"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Spain"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "France"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hungary"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italy"
 
-#: ../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 "Netherlands"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norway"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Poland"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Russia"
 
-#: ../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 "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 "United Kingdom"
 
-#: ../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 "United States"
 
-#: ../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"
@@ -2204,8 +1931,7 @@ msgstr ""
 "\n"
 "Ok lang ba na magpatuloy?"
 
-#: ../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"
@@ -2218,24 +1944,27 @@ msgstr ""
 "\n"
 "Ok lang ba na magpatuloy?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s na pagpipilian"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Pakihintay, dina-download ang mga address ng mirror."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Pakihintay, dina-download ang mga address ng mirror mula sa Mandriva website."
 
-#: ../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 habang nagda-download"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2249,8 +1978,8 @@ msgstr ""
 "Ang network, o ang website, ay maaaring hindi available.\n"
 "Pakisubukan muli mamaya."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2264,18 +1993,15 @@ msgstr ""
 "Ang network, o Mandriva website, ay maaaring hindi available.\n"
 "Pakisubukan muli mamaya."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Walang mirror"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Hindi ako makahanap ng angkop na mirror."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2289,69 +2015,64 @@ msgstr ""
 "ay ang kaso na kung ang arkitektura ng processor mo ay hindi\n"
 "suportado ng Mandriva Linux Official Updates."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Pakipili ang hinahangad na mirror."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kinokopya ang file para sa medium na `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Sinusuri ang file ng medium na `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Sinusuri ang remote file ng medium na `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " tapos."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " nabigo!"
 
 #. -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 mula sa medium na %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Sinisimulan ang pagda-download ng `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Pagda-download ng `%s', nalalabing oras:%s, tulin:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Pagda-download ng `%s', tulin:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Pakihintay, ina-update ang media..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "May error o mali sa muling pagkuha ng mga package"
 
-#: ../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 +2089,29 @@ msgstr ""
 "ito, O kaya ay hindi ito maabot sa kasalukuyan at dapat subukan na lamang\n"
 "muli mamaya."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "I-update ang 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 "Piliin ang media na nais mong i-update:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Piliin lahat"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "I-update"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2407,8 +2123,8 @@ msgstr ""
 "Mga error:\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 +2134,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Hindi magawa ang medium."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Kabiguan kung nagdadagdag ng medium"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2439,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"
@@ -2450,8 +2164,8 @@ msgstr ""
 "version ng %s na inyong pinapatakbo (%s).\n"
 "Hindi ito papaganahin."
 
-#: ../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"
@@ -2461,13 +2175,11 @@ msgstr ""
 "version ng Mandriva Linux na inyong pinapatakbo (%s).\n"
 "Hindi ito papaganahin."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Ang Tulong ay inilunsad sa background"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2744,6 +2456,18 @@ msgstr "Mag-alis ng Software"
 msgid "Software Media Manager"
 msgstr "Tagapangasiwa ng Software Media"
 
+#~ msgid "Stop"
+#~ msgstr "Hinto"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Lahat ng package, ayon sa lagakan ng medium"
+
+#~ msgid "Normal information"
+#~ msgstr "Normal na inpormasyon"
+
+#~ msgid "Maximum information"
+#~ msgstr "Pinakamaraming inpormasyon"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "lahat ay na-install nang tama"
 
diff --git a/po/tr.po b/po/tr.po
index 904ded7c..339ff96f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-tr\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: 2004-02-26 20:30+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -20,13 +20,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"
@@ -40,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 "Normal güncellemeler"
 
-#: ../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,104 +63,87 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Lütfen bekleyin, medya güncelleniyor..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Bir medya ekle"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Yerel dosyalar"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Yol:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP sunucu"
 
-#: ../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 sunucu"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP sunucu"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Kaldırılabilinir aygıt"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Yol veya bağlama noktası:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Kaldırılabilinir aygıt"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Gözat..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Kullanıcı adı:"
 
-#: ../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 "Parola:"
 
-#: ../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'e göreli yol:"
 
-#: ../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 "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 "Güncellemek istediğiniz medyayı seçiniz:"
 
-#: ../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 "En azından İlk iki girişi doldurmak zorundası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?"
@@ -171,13 +151,11 @@ msgstr ""
 "Aynı isme sahip bir başka ortam mevcut, onu\n"
 "değiştirmek ister misiniz?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Bir meyda ekleniyor:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Medya Türü:"
 
@@ -185,10 +163,9 @@ msgstr "Medya Türü:"
 #: ../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 "İptal"
 
@@ -197,103 +174,92 @@ msgstr "İptal"
 #: ../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 "Tamam"
 
 #: ../edit-urpm-sources.pl:308
-#, fuzzy, c-format
+#, fuzzy
 msgid "Global options for package installation"
 msgstr "Paket kurulumuna hazırlanılıyor..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "hiç"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Bazı paketler kurulamadı"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "'%s' indirmesi , hız:%s"
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Yazılım Paketleri Kaldırıcı"
 
 #: ../edit-urpm-sources.pl:352
-#, fuzzy, c-format
+#, fuzzy, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 "%s anahtarını, %s kaynağından kaldırmak istediğinize emin misiniz?\n"
 "(Anahtarın adı: %s)"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Lütfen bekleyin, medya(kaynak) kaldırılıyor..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Bir medyayı düzenle"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" meydası düzenleniyor:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: ../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 "Vekil Sunucu..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Devam etmek için ortamı takmanız gerekli"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Değişiklikleri kaydetmek için ortamı sürücüye takın."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Vekil sunucuları yapılandır"
 
 #: ../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]>):"
@@ -302,167 +268,138 @@ msgstr ""
 "portu girin (<vekilsunucu[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Vekil sunucu adı:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Vekil sunucu kimlik denetimi için kullanıcıadı/parola belirtebilirsiniz:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Kullanıcı:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Bir paralel grup ekle"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Bir paralel grubu düzenle"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Bir medya sınırlaması ekle"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Medya sınırlaması konulacak medyayı seçiniz:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Bir makine Ekle"
 
 #: ../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\"ortak grubu düzenleniyor :"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Grup adı:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Medya sınırlaması:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Ekle"
 
 #: ../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 "Kaldır"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Makineler:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ortak urpmi yapılandırılması (distributed execution of urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Grup"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Medya sınırlaması"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Komut"
 
-#: ../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 "(hiç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üzenle..."
 
-#: ../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 "Ekle..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Paketlerin dijital imza anahtarlarını yönet"
 
-#: ../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 "Medya"
 
 #: ../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 "Bir anahtar ekle"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "%s kaynağına eklemek için bir anahtar seçin"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Bir anahtar kaldır"
 
 #: ../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 ""
 "(Anahtarın adı: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Bir anahtar ekle..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Anahtarı Kaldır"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Medyayı yapılandır"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Etkin?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Güncelle"
 
-#: ../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,33 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:988
+#, fuzzy
 msgid "Add custom..."
 msgstr "Ekle..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Güncelle..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Anahtarları Yönet"
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Parelel..."
 
-#: ../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 "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 +479,7 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı ?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -568,8 +494,7 @@ msgstr ""
 "size yardımcı olacak. Böylece yeni yazılım paketleri yükleme ve eskilerini\n"
 "güncelleme imkanı bulacaksı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"
@@ -581,13 +506,23 @@ msgstr ""
 "başka bir kaynak yöneticisi kullanıyor olabilirsiniz ya da\n"
 "yüklü paketler doğru olarak yüklenmemiş olabilir)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Ortam eklenemedi, yanlış ya da eksik bilgi"
 
-#: ../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' yeni paket kaynağını eklemek üzeresiniz. Bu; \n"
+"daha sonra bu paket kaynağını, bilgisayarınıza yeni\n"
+"yazılımlar yüklemek için kullanabileceğiniz anlamına geliyor."
+
+#: ../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"
@@ -597,89 +532,80 @@ msgstr ""
 "daha sonra bu paket kaynağını, bilgisayarınıza yeni\n"
 "yazılımlar yüklemek için kullanabileceğiniz anlamına geliyor."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "`%s' ortamı başarıyla eklendi."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "`%s' ortamı başarıyla eklendi."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Kullanımı: %s [SEÇENEK]..."
 
-#: ../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 "Kullanıcı kipinde çalıştırılıyor"
 
-#: ../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 +615,519 @@ msgstr ""
 "Sistem üzerinde düzenlemeler yapamayacaksınız,\n"
 "fakat mevcut veri tabanına göz atabilirsiniz."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Erişilebilirlik"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arşivleme"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Yedekleme"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Cd-yazımı"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Sıkıştı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 "Diğer"
 
-#: ../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 "Kitaplar"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Bilgisayar kitapları"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "SSS"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "NeNasıllar"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Edebiyat"
 
-#: ../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 "İletişim"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Veritabanları"
 
-#: ../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 "Geliştirme"
-
-#: ../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 "Geliştirme"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME ve GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE ve Qt"
 
-#: ../rpmdrake:208
-#, c-format
+#: ../rpmdrake:218
 msgid "Kernel"
 msgstr "Çekirdek"
 
-#: ../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 "Düzenleyiciler"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Eğitim"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emülatörler"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Dosya araçları"
 
-#: ../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 "Macera"
 
-#: ../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 "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Tahtalar"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Kartlar"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Bulmacalar"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Spor"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Strateji"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Grafiksel 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 "Grafiksel masaüstü"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM temelli"
 
-#: ../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 "Grafikler"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "İzleme"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Çoklu Ortam"
 
-#: ../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 "Ağ"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Muhabbet"
 
-#: ../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 "Ağ"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Dosya nakli"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Anında mesajlaşma"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Posta"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Haber"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Uzaktan erişim"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Ofis"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Yayınlama"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Fen"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Gökbilimi"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Fen"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biyoloji"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kimya"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Bilgisayar bilimi"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Yerbilimi"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematik"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fizik"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Kabuklar"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Ses"
 
-#: ../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 "Temel"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Yapılandı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ış ve başlatma"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Yapılandırma"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Donanım"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Paketleme"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Yazdırma"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Geliştirme"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Geliştirme"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Yazı Tipleri"
-
-#: ../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ı Tipleri"
+
+#: ../rpmdrake:278
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Tür1"
 
-#: ../rpmdrake:269
-#, c-format
+#: ../rpmdrake:280
 msgid "X11 bitmap"
 msgstr "X11 Bitişlem"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Ulusallaştırma"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Çekirdek ve donanım"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Kütüphaneler"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Sunucular"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminaller"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Metin araçları"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Oyuncaklar"
 
-#: ../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 "(Erişilemez)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Arama sonuçları"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Arama sonuçları (hiçbiri)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Lütfen bekleyin, aranıyor..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Dur"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Eklenebilir"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Güncellenebilinir"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Eklenebilir"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Seçilmedi"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Seçili"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Seçilmedi"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Önem: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Güncelleme nedeni: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Tanımlanmamış"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Dosyalar:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Günlük:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Medya: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Kurulu olan sürüm: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Adı: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Sürümü: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Boyut: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Önem: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Boyut: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Özet: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Güncelleme nedeni: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Tanım: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Tanımlanmamış"
+#. 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 hakkında daha fazla bilgi..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Lütfen seçin"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Şu paketler birinin yüklenmesi gerekiyor:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Lütfen seçin"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Lütfen bekleyin, paketler listeleniyor..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Güncelleme yok"
 
-#: ../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 +1137,24 @@ msgstr ""
 "güncelleme olmadığı ya da bütün güncellemeleri yüklediğiniz anlamına\n"
 "gelir."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Hepsi"
 
 #. -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 fazla bilgi"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Paket hakkında daha fazla bilgi"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Bazı ek paketlerin kaldırılması gerekiyor"
 
-#: ../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 ""
 "Bağımlılıkları nedeniyle şu paketlerinde kaldırlması gerekiyor:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Bazı paketler kaldırılamadı"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1371,8 +1175,7 @@ msgstr ""
 "Bu paketleri kaldırmak sisteminizin göçmesine sebeb olabilir, üzgünüm:\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"
@@ -1381,13 +1184,11 @@ msgstr ""
 "Bağımlılıkları nedeniyle şu paketlerin seçili olmaması gerekiyor:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Ek paketlere ihtiyaç var"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1397,18 +1198,17 @@ msgstr ""
 "gerekiyor:\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 "Bazı paketler kurulamadı"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1418,123 +1218,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Bazı paketlerin kaldırılması gerekiyor"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seçili: %d MB / Diskteki boş alan: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Seçili boyut: %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 "Güvenlik güncellemeleri"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Hata düzeltme güncellemeleri"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Kur"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Normal güncellemeler"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Kur"
 
-#: ../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çimleri"
 
-#: ../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üm paketler, alfabetik"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Tüm paketler, gruba göre"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Tüm paketler, güncellemesi mevcut olanlar"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Tüm paketler, boyuta göre"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Tüm paketler, seçim sırasına göre"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Tüm paketler, veri kaynağına göre"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Tüm paketler, güncellemesi mevcut olanlar"
-
-#: ../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üm paketler, gruba göre"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Normal güncellemeler"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Hata düzeltme güncellemeleri"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Normal güncellemeler"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Güvenlik güncellemeleri"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "isimlerde"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "tanımlarda"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "dosya isimlerinde"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Normal bilgi"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "En fazla bilgi"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Önce paket seçmelisin."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Aşırı fazla paket seçildi"
 
 #: ../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"
@@ -1550,7 +1335,7 @@ msgstr ""
 "Bütün seçili paketleri gerçekten yüklemek istiyor musunuz?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1564,89 +1349,100 @@ msgstr ""
 "\n"
 "Devam edilsin mi?"
 
-#: ../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 "/_Dosya"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Medya güncelle"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Seçimi sıfırla"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Paket listesini yeniden yükle"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/Çı_k"
 
-#: ../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 "/S_eçenekler"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Kendiliğinden seçilen paketleri göster"
 
-#: ../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 Güncelleme"
+
+#. -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 "Bul:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Ara"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Temizle"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Kur"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Çık"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Ölümcül hata"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Bir ölümcül hata oluştu: %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"
@@ -1658,13 +1454,12 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Bu güncelleme kaynağı zaten mevcut"
 
-#: ../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"
@@ -1680,13 +1475,12 @@ msgstr ""
 "\n"
 "Sonra %s'yi tekrar çalıştırın."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Yansınızı elle nasıl seçersiniz?"
 
-#: ../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 +1494,56 @@ msgstr ""
 "\n"
 "Sonra %s'yi tekrar çalıştırın."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "%s inceleniyor"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "değişiklikler:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Kaldır .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Ana dosya olarak .%s kullan"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Birşey yapma"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Kurulum tamamlandı"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "İncele..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "İstenen paketler başarılı bir şekilde yüklendi."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Kurulum sırası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"
@@ -1761,18 +1553,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Kaynak paketleri alınamıyor."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "%s kaynak paketleri alınamadı, üzgünüm."
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1784,38 +1575,34 @@ msgstr ""
 "Hata(lar) rapor edildi:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Paket Kurulumu..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Başlatılıyor..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Paket Kurulumu..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Ortam değiştir"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lütfen [%s] aygıtına \"%s\" kaynağını yerleştirin."
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' paketi indiriliyor (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Paket imzaları kontrol ediliyor..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1829,13 +1616,12 @@ msgstr ""
 "\n"
 "Yüklemeye devam etmek istiyor musunuz?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Kurulum başarısız"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1847,23 +1633,22 @@ msgstr ""
 "\n"
 "Medya(kaynak) veritabanınızı güncellemek isteyebilirsiniz."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Paket kurulumuna hazırlanılıyor..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "'%s' paketi kuruluyor ( %s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm dosyasına [%s] erişilemiyor"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1875,44 +1660,34 @@ msgstr ""
 "'.rpmnew' veya '.rpmsave' olak bazı yapılandırma dosyaları oluşturuldu.\n"
 "Harekete geçmek için artık birkaçını inceleyebilirsiniz:"
 
-#: ../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 "Paket hakkında daha fazla bilgi..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Kurulacak hiçbir paket bulunamadı."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Düzeltilemeyecek hata; yüklemek için herhangi bir paket bulunamadı,üzgünüm. "
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Lütfen bekleyin, paketler kaldırılıyor..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Kaldırım esnasında problem"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1922,8 +1697,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1935,8 +1709,8 @@ msgstr ""
 "Bu araç, bilgisayarınızdan kaldırmak istediğiniz uygulamaları seçmede size\n"
 "yardımcı olacak."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1948,13 +1722,11 @@ msgstr ""
 "Bu araç, bilgisayarınıza yüklemek istediğiniz güncellemeleri seçmede size\n"
 "yardımcı olacak."
 
-#: ../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 +1741,177 @@ msgstr ""
 "yazılımları\n"
 "seçmede size yardımcı olacak."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Yazılım Paketleri Kaldırıcı"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Güncelleme"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Yazılım Paketleri Kaldırıcı"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Lütfen e-posta adresinizi aşağıya giriniz "
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Kullanıcı adı:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Yazılım Paketleri Kaldırıcı"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Yazılım Paketleri Kaldırıcı"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Paket Kurulumu"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Hayır"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Evet"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Hakkında..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Avusturya"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Avusturalya"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Belçika"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brezilya"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "İsviçre"
 
-#: ../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 "Çek Cumhuriyeti"
 
-#: ../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 "Yunanistan"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "İspanya"
 
-#: ../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 "Macaristan"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "İsrail"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "İtalya"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Japonya"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Kore"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Hollanda"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norveç"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polonya"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portekiz"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rusya"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "İsveç"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Slovakya"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Birleşik Krallık"
 
-#: ../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 "Birleşik Devletler"
 
-#: ../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 +1923,7 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı?"
 
-#: ../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 +1935,28 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Lütfen bekleyin, yansı adresleri Mandriva'un web sitesinden indiriliyor."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Lütfen bekleyin, yansı adresleri Mandriva'un web sitesinden indiriliyor."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "İndirme sırasında hata"
 
-#: ../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 +1970,8 @@ msgstr ""
 "Ağ veya Mandriva'un web sayfasını erişilemez durumda\n"
 "olabilir. Lütfen daha sonra tekrar deneyin."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2248,18 +1985,15 @@ msgstr ""
 "Ağ veya Mandriva'un web sayfasını erişilemez durumda\n"
 "olabilir. Lütfen daha sonra tekrar deneyin."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Yansı yok"
 
-#: ../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 +2007,64 @@ msgstr ""
 "mimarinizin Mandriva Linux Resmi Güncellemeler tarafından\n"
 "desteklenmemesidir."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Lütfen istediğiniz yansıyı seçin."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Dosya '%s' medyasından kopyalanıyor..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "'%s' medyasının dosyayı sınanıyor..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "'%s' uzak medyasının dosyası sınanıyor..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " tamamlandı."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " başarısız!"
 
 #. -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 kaynağından %s "
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "'%s' indirilmeye başlanıyor..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "'%s' indirmesi , kalan zaman:%s , hız:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "'%s' indirmesi , hız:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Lütfen bekleyin, medya güncelleniyor..."
 
-#: ../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"
@@ -2345,34 +2074,30 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Medya Güncelle"
 
-#: ../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 "Güncellemek istediğiniz medyayı seçiniz:"
 
-#: ../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 "Güncelle"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2384,8 +2109,8 @@ msgstr ""
 "Hatalar:\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"
@@ -2395,18 +2120,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Ortam oluşturulamıyor."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Ortam eklenirken hata oluştu"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2416,29 +2139,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 "Yardım arkaplanda çalıştırıldı"
 
-#: ../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 penceresi başlatıldı, masaüstünüzden kolayca ulaşabilirsiniz."
@@ -2713,6 +2434,18 @@ msgstr "Yazılımı Kaldır"
 msgid "Software Media Manager"
 msgstr "Yazılım Kaynak Yöneticisi"
 
+#~ msgid "Stop"
+#~ msgstr "Dur"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Tüm paketler, veri kaynağına göre"
+
+#~ msgid "Normal information"
+#~ msgstr "Normal bilgi"
+
+#~ msgid "Maximum information"
+#~ msgstr "En fazla bilgi"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "Herşey kusursuz kuruldu"
 
diff --git a/po/uk.po b/po/uk.po
index f1cd9250..d3d01748 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -15,7 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-uk\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-06-27 13:32+0300\n"
 "Last-Translator: Taras Boychuk <btr1@mail.ru>\n"
 "Language-Team: ukrainian <translation@linux.org.ua>\n"
@@ -24,13 +25,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"
@@ -51,18 +50,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,84 @@ 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 "Add a medium"
 
-#: ../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
-#, 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?"
@@ -187,13 +164,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 +176,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,101 +187,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]>):"
@@ -316,166 +275,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)"
@@ -484,37 +414,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
-#, 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 "Додати вказаний..."
 
-#: ../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"
@@ -565,8 +483,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"
@@ -593,13 +509,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"
@@ -609,18 +535,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"
@@ -628,44 +558,37 @@ 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"
@@ -673,33 +596,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                 виконати як 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"
@@ -709,634 +626,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 "Гноме і 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 "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 кб"
 
-#: ../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"
@@ -1346,29 +1146,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"
@@ -1378,13 +1173,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"
@@ -1392,8 +1185,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"
@@ -1403,13 +1195,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"
@@ -1419,18 +1209,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"
@@ -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 "Деякі пакунки повинні бути видалені"
 
-#: ../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"
@@ -1573,7 +1347,7 @@ msgstr ""
 "Ви дійсно хочете встановити всі вибрані пакунки?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1587,89 +1361,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"
@@ -1682,13 +1467,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"
@@ -1703,13 +1487,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"
@@ -1723,58 +1506,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"
@@ -1784,18 +1565,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"
@@ -1807,38 +1587,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"
@@ -1852,13 +1628,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"
@@ -1870,23 +1645,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 "неможливо отримати доступ до файла [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1898,43 +1671,33 @@ msgstr ""
 "Деякі конфігураційні файли були створені як '.rpmnew' або '.rmpsave',\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 "Зачекайте, будь ласка, поки rpm вилучає ці пакунки..."
 
-#: ../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"
@@ -1944,8 +1707,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1957,8 +1719,8 @@ msgstr ""
 "Цей інструмент допоможе Вам вибрати, які пакунки Ви хочете вилучити з свого\n"
 "комп'ютера."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1970,13 +1732,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"
@@ -1990,214 +1750,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 "Швейцарія"
 
-#: ../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"
@@ -2209,8 +1927,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"
@@ -2223,24 +1940,27 @@ 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"
@@ -2254,8 +1974,8 @@ msgstr ""
 "Можливо, мережа або веб-сайт недоступні.\n"
 "Будь ласка, спробуйте ще раз пізніше."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2269,18 +1989,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"
@@ -2294,69 +2011,64 @@ msgstr ""
 "стається через те, що архітектура Вашого процесора не підтримується\n"
 "Mandriva Linux Official 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
-#: ../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"
@@ -2371,36 +2083,31 @@ 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"
@@ -2412,8 +2119,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"
@@ -2423,18 +2130,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"
@@ -2444,8 +2149,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"
@@ -2455,8 +2160,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"
@@ -2466,13 +2171,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 "Вікно довідки вже стартувало, незабаром воно з'явиться на стільниці."
@@ -2746,3 +2449,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/uz.po b/po/uz.po
index ff9c1dd2..f22c22f3 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-uz\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-05 01:51+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -16,13 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\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 "Оддий янгилаш"
 
-#: ../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"
 "Давом этишни истайсизми?"
 
-#: ../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
-#, 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 "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 ""
 
-#: ../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?"
@@ -167,13 +148,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 "Манбанинг тури:"
 
@@ -181,10 +160,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 "Бекор қилиш"
 
@@ -193,101 +171,91 @@ 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
-#, fuzzy, c-format
+#, fuzzy
 msgid "never"
 msgstr "Серверлар"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Баъзи бир пакетларни ўрнатиб бўлмайди"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "\"%s\" олинмоқда, тезлик: %s"
 
 #: ../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
-#, 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 ""
 
 #: ../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]>):"
@@ -296,241 +264,202 @@ 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 ""
 
 #: ../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"
 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)"
 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
-#, 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"
@@ -540,8 +469,7 @@ msgstr ""
 "\n"
 "Давом этишни истайсизми?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -555,8 +483,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"
@@ -564,102 +491,102 @@ 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
+#, 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
-#, 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"
@@ -669,663 +596,544 @@ 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 "Howto'лар"
 
-#: ../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 "Аркада"
 
-#: ../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 "Тизимни юклаш"
 
-#: ../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 "True type"
 
-#: ../rpmdrake:268
-#, c-format
+#: ../rpmdrake:279
 msgid "Type1"
 msgstr "Type1"
 
-#: ../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 "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 "Changelog:\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"
 "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"
@@ -1335,13 +1143,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"
@@ -1349,21 +1155,18 @@ 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"
 "\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"
@@ -1373,18 +1176,17 @@ msgstr ""
 "ҳам ўрнатилиши керак:\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 "Баъзи бир пакетларни ўрнатиб бўлмайди"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1394,123 +1196,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 ""
 
-#: ../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 "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:1010
+msgid "Leaves only, sorted by install date"
+msgstr ""
 
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Ҳамма пакетлар: янгилаш имконияти бўйича"
+#: ../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
+#: ../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"
@@ -1527,7 +1314,7 @@ msgstr ""
 "Танланган пакетларни ростдан ўрнатишни истайсизми?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1541,89 +1328,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"
@@ -1631,13 +1429,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"
@@ -1647,13 +1444,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"
@@ -1662,58 +1458,56 @@ 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 "%s текширилмоқда"
 
-#: ../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 "Файлни (.%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"
@@ -1723,18 +1517,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 ""
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1746,38 +1539,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"
@@ -1791,13 +1580,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"
@@ -1809,23 +1597,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"
@@ -1833,43 +1619,33 @@ 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
-#, 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"
@@ -1879,8 +1655,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1892,8 +1667,8 @@ msgstr ""
 "Бу восита компьютерингиздан олиб ташламоқчи бўлган дастурларни\n"
 "танлашда сизга ёрдам беради."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1905,13 +1680,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"
@@ -1925,214 +1698,177 @@ msgstr ""
 "DVD ёки компакт-дискда тарқатилади. Бу восита компьютерингизга\n"
 "дастурларни ўрнатиш учун уларни танлашда сизга ёрдам беради."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Дастур пакетларини олиб ташлаш"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux янгилаш"
 
-#: ../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
-#, 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
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 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
-#, 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"
@@ -2144,8 +1880,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"
@@ -2157,23 +1892,26 @@ msgstr ""
 "\n"
 "Давом этишни истайсизми?"
 
-#: ../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
-#, 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"
@@ -2182,8 +1920,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"
@@ -2192,18 +1930,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"
@@ -2212,69 +1947,64 @@ 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 "Манба (%s) файли текширилмоқда..."
 
-#: ../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
-#, 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"
@@ -2284,34 +2014,30 @@ 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
-#, 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"
@@ -2319,26 +2045,24 @@ 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"
@@ -2348,29 +2072,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 ""
@@ -2645,6 +2367,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/uz@Latn.po b/po/uz@Latn.po
index 43faffa0..a21bb09d 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-uz\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-05 01:51+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -16,13 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\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 "Oddiy yangilash"
 
-#: ../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"
 "Davom etishni istaysizmi?"
 
-#: ../edit-urpm-sources.pl:96
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:98
+#, fuzzy
 msgid "Please wait, adding media..."
 msgstr "Manba yangilanmoqda, iltimos kutib turing..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Manbani qo'shish"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Lokal fayllar"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Yo'l:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "FTP serveri"
 
-#: ../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 serveri"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "HTTP serveri"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Olinadigan uskunalar"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Yo'l yoki ulash nuqtasi:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Olinadigan uskunalar"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Tanlash"
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Foydalanuvchi:"
 
-#: ../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 "Maxfiy so'z:"
 
-#: ../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 fayliga nisbiy yo'l:"
 
-#: ../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 "Nomi:"
 
 #: ../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 "Siz yangilamoqchi bo'lgan manbani tanlang:"
 
-#: ../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 "Kamida birinchi ikkita maydonni to'ldirish kerak."
 
-#: ../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 ""
 "Huddi shunday nomli manba allaqachon mavjud.\n"
 "Uni almashtirishni istaysizmi?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Manba qo'shilmoqda:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Manbaning turi:"
 
@@ -181,10 +160,9 @@ msgstr "Manbaning turi:"
 #: ../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 "Bekor qilish"
 
@@ -193,101 +171,91 @@ msgstr "Bekor qilish"
 #: ../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 "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:311
-#, fuzzy, c-format
+#, fuzzy
 msgid "never"
 msgstr "Serverlar"
 
 #: ../edit-urpm-sources.pl:320
-#, fuzzy, c-format
+#, fuzzy
 msgid "Verify RPMs to be installed:"
 msgstr "Ba'zi bir paketlarni o'rnatib bo'lmaydi"
 
 #: ../edit-urpm-sources.pl:321
-#, fuzzy, c-format
+#, fuzzy
 msgid "Download program to use:"
 msgstr "\"%s\" olinmoqda, tezlik: %s"
 
 #: ../edit-urpm-sources.pl:351
-#, fuzzy, c-format
+#, fuzzy
 msgid "Source Removal"
 msgstr "Dastur paketlarini olib tashlash"
 
 #: ../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 "Manba olib tashlanmoqda, iltimos kutib turing..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Manbani tuzatish"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Manba (\"%s\") tuzatilmoqda:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "O'zgarishlarni saqlash"
 
-#: ../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 "Davom etish uchun manbani ko'yishingiz kerak"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "O'zgarishlarni saqlash uchun manbani uskunaga qo'yishingiz kerak."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Proksini moslash"
 
 #: ../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]>):"
@@ -296,242 +264,203 @@ msgstr ""
 "raqamini) kiriting (m-n <server[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proksi kompyuterning nomi:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Proksi tasdiqlash uchun foydalanuvchi/maxfiy so'zni ko'rsatishingiz mumkin:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Foydalanuvchi:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Parallel guruhni qo'shish"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Parallel guruhni tuzatish"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Manba chegarasini qo'shish"
 
 #: ../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 "Kompyuterni qo'shish"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Qo'shish uchun kompyuterning nomini yoki IP raqamini kiriting:"
 
 #: ../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 "Guruhning nomi:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Manba chegarasi:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Qo'shish"
 
 #: ../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 "Olib tashlash"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Kompyuterlarning nomi:"
 
 #: ../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 "Guruh"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Protokol"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Manba chegarasi"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protokol"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Buyruq"
 
-#: ../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 "(yo'q)"
 
-#: ../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 "Tahrirlash..."
 
-#: ../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 "Qo'shish..."
 
 #: ../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 "Manba"
 
 #: ../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 "Kalitni qo'shish"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Manbaga (%s) qo'shish uchun kalitni tanlang"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Kalitni olib tashlash"
 
 #: ../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 "Kalitni qo'shish"
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Kalitni olib tashlash"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Manbalarni moslash"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Yoqilgan"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Yangilash"
 
-#: ../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 "Qo'shish..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Yangilash..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Kalitlarni boshqarish"
 
-#: ../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 "Yordam"
 
-#: ../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"
@@ -541,8 +470,7 @@ msgstr ""
 "\n"
 "Davom etishni istaysizmi?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -556,8 +484,7 @@ msgstr ""
 "moslashda sizga yordam beradi. Moslagandan kegin, ular yangi\n"
 "dasturlarni o'rnatishda yoki yangilanishlarni qo'llashda ishlatiladi."
 
-#: ../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"
@@ -565,102 +492,102 @@ 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
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "\"%s\" manbasi muvaffaqiyatli qo'shildi."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "\"%s\" manbasi muvaffaqiyatli qo'shildi."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Foydalanish: %s [PARAMETRLAR]..."
 
-#: ../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       - faqat yangilash manbasidan foydalanish.\n"
 
-#: ../rpmdrake:42
-#, fuzzy, c-format
+#: ../rpmdrake:45
+#, fuzzy
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - faqat paketning nomini ko'rsatish.\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
-#, 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 "Foydalanuvchi usulida ishga tushirilmoqda"
 
-#: ../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"
@@ -670,663 +597,544 @@ msgstr ""
 "tushirayapsiz. Tizimga o'zgarishlar kiritib bo'lmaydi,\n"
 "ammo mavjud bo'lgan ma'lumot bazasini ko'rishingiz mumkin."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Qulayliklar"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Arxivlash"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Zahira nusxasi"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Kompakt-diskga yozish"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Qisish"
 
-#: ../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 "Boshqa"
 
-#: ../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 "Kitoblar"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Kompyuter haqida kitoblar"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Tez-tez so'raladigan savollar"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howto'lar"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Adabiyot"
 
-#: ../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 "Aloqa"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Ma'lumot bazalari"
 
-#: ../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 "Tuzish"
-
-#: ../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 "Tuzish"
+
+#: ../rpmdrake:213
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:205
-#, c-format
+#: ../rpmdrake:215
 msgid "GNOME and GTK+"
 msgstr "GNOME va GTK+"
 
-#: ../rpmdrake:206
-#, c-format
+#: ../rpmdrake:216
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:207
-#, c-format
+#: ../rpmdrake:217
 msgid "KDE and Qt"
 msgstr "KDE va 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 "Tahrirchilar"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Ta'lim"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulyatorlar"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Fayl vositalari"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "O'yinlar"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Sarguzashtlar"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "O'yinlar"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arkada"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Stol o'yinlari"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Qartalar"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Boshqotirmalar"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Sport"
 
-#: ../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 "Grafik ishchi stoli"
-
-#: ../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 "Grafik ishchi stoli"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "FVWM asosida"
 
-#: ../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 "Nazorat qilish"
 
-#: ../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 "Tarmoqda ishlash"
-
-#: ../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 "Tarmoqda ishlash"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Fayl uzatish"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Xabar almashish"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Xat-xabar"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Yangiliklar"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Masofadan ulanish"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "Internet"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Idora uchun dasturlar"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Nashr etish"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Tabiiy fanlar"
-
-#: ../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 "Tabiiy fanlar"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biologiya"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Kimyo"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informatika"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Er haqida fanlar"
 
-#: ../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 "Konsollar"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Tovush"
 
-#: ../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 "Tizim"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Asosiy"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Moslash"
+#: ../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 "Tizim"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Tizimni yuklash"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Moslash"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Asbob-uskunalar"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Paketlar"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Bosib chiqarish"
 
-#: ../rpmdrake:264
-#, fuzzy, c-format
+#: ../rpmdrake:275
+#, fuzzy
 msgid "Deploiement"
 msgstr "Tuzish"
 
-#: ../rpmdrake:265
-#, fuzzy, c-format
+#: ../rpmdrake:276
+#, fuzzy
 msgid "Deployment"
 msgstr "Tuzish"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Shriftlar"
-
-#: ../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 "Shriftlar"
+
+#: ../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 ""
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Tarjimalar"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel va asbob-uskunalar"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Kutubxonalar"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Serverlar"
 
-#: ../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 "Matn vositalari"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "O'yinchoqlar"
 
-#: ../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 "(Mavjud emas)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Qidiruv natijalari"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Qidiruv natijalari (yo'q)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Qirilmoqda, iltimos kutib turing..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "To'xtatish"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Qo'shsa bo'ladi"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Qo'shsa bo'ladi"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Tanlanmagan"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Tanlangan"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Tanlanmagan"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Muhimligi: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Yangilash uchun sabab: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+#, fuzzy
+msgid "No description"
+msgstr "ta'riflarda"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fayllar:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Manba: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "O'rnatilgan versiyasi: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Nomi: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Versiya: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Hajmi: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s Kb"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Muhimligi: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Hajmi: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Hisobot: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Yangilash uchun sabab: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Ta'rifi: "
 
-#: ../rpmdrake:587
-#, fuzzy, c-format
-msgid "No description"
-msgstr "ta'riflarda"
+#. 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 haqida qo'shimcha ma'lumot..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Iltimos tanlang"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Quyidagi paketlardan bittasi kerak:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Iltimos tanlang"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Paketlar ro'yxati yaratilmoqda, iltimos kurib turing..."
 
-#: ../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 "Hammasi"
 
 #. -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 "Qo'shimcha ma'lumot"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Paketlar haqida ma'lumot"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Ba'zi bir qo'shimcha paketlarni olib tashlash kerak"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1336,13 +1144,11 @@ msgstr ""
 "tashlash kerak:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Ba'zi bir paketlarni olib tashlab bo'lmaydi"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1350,21 +1156,18 @@ msgstr ""
 "Bu paketlarni olib tashlash tizimni ishdan chiqaradi, uzr:\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 "Qo'shimcha paketlar kerak"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1374,18 +1177,17 @@ msgstr ""
 "ham o'rnatilishi kerak:\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 "Ba'zi bir paketlarni o'rnatib bo'lmaydi"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1395,123 +1197,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Ba'zi bir paketlarni olib tashlash kerak"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Tanlangan hajm: %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 "Xavfsizlikga oid yangilanishlar"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr ""
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "O'rnatish"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Oddiy yangilash"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "O'rnatish"
 
-#: ../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 termasi"
 
-#: ../rpmdrake:963
-#, c-format
+#. let's keep the translated strings (to be resurected as sorting the treeview):
+#: ../rpmdrake:1006
 msgid "All packages, alphabetical"
 msgstr "Hamma paketlar: alifbo bo'yicha"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Hamma paketlar: guruh bo'yicha"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Hamma paketlar: yangilash imkoniyati bo'yicha"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Hamma paketlar: hajmi bo'yicha"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Hamma paketlar: tanlash holati bo'yicha"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Hamma paketlar: manba bo'yicha"
+#: ../rpmdrake:1010
+msgid "Leaves only, sorted by install date"
+msgstr ""
 
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Hamma paketlar: yangilash imkoniyati bo'yicha"
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Hamma paketlar: guruh bo'yicha"
 
-#: ../rpmdrake:982
-#, c-format
-msgid "Leaves only, sorted by install date"
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Oddiy yangilash"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Oddiy yangilash"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Xavfsizlikga oid yangilanishlar"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "nomlarda"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "ta'riflarda"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "fayl nomlarida"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Qisqa ma'lumot"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "To'liq ma'lumot"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Avvalo, ba'zi bir paketlarni tanlashingiz kerak"
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Juda ko'p paketlar tanlangan"
 
 #: ../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"
@@ -1528,7 +1315,7 @@ msgstr ""
 "Tanlangan paketlarni rostdan o'rnatishni istaysizmi?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1542,89 +1329,100 @@ msgstr ""
 "\n"
 "Davom etishni istaysizmi?"
 
-#: ../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
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Manbani yangilash"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Tanlashni tiklash"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/_Paketlar ro'yxatini qaytadan yuklash"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/Chi_qish"
 
-#: ../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 "/_Parametrlar"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/_Avtomatik ravishda tanlangan paketlarni ko'rsatish"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Yordam"
 
-#: ../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 yangilash"
+
+#. -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 "Qidirish:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Qidirish"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Tozalash"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "O'rnatish"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Chiqish"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Juda jiddiy xato"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Juda jiddiy xato ro'y berdi: %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"
@@ -1632,13 +1430,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"
@@ -1648,13 +1445,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"
@@ -1663,58 +1459,56 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Mavjud bo'lgan paketlar qidirilmoqda, iltimos kutib turing..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Paketlar ma'lumot bazasi o'qilmoqda, iltimos kutib turing..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "%s tekshirilmoqda"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "o'zgarishlar:"
 
-#: ../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 "Faylni (.%s) asosiy fayl sifatida ishlatish"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Hech narsa qilmash"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "O'rnatish tugadi"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Tekshirish..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Talab qilingan hamma paketlar muvaffaqiyatli o'rnatildi."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "O'rnatishda xato yuzaga keldi"
 
-#: ../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"
@@ -1724,18 +1518,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 ""
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1747,38 +1540,34 @@ msgstr ""
 "Xatolar:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Paketlarni o'rnatish"
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Ishga tayyorlanmoqda..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Paketlarni o'rnatish"
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Manbani o'zgartirish"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Iltimos \"%s\" nomli manbani [%s] uskunaga qo'ying"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) paketi olinmoqda..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Paketlarning imzolari tekshirilmoqda..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1792,13 +1581,12 @@ msgstr ""
 "\n"
 "O'rnatishni davom ettirishni istaysizmi?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1810,23 +1598,21 @@ msgstr ""
 "\n"
 "Balki manba ma'lumot bazasini yangilashingiz kerak."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1834,43 +1620,33 @@ 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 "Paket haqida qo'shimcha ma'lumot..."
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "O'rnatish uchun paket topilmadi."
 
-#: ../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 "Paketlar ma'lumot bazasi o'qilmoqda, iltimos kutib turing..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Paketlar olib tashlanmoqda, iltimos kutib turing..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Olib tashlashda muammo yuzaga keldi"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1880,8 +1656,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1893,8 +1668,8 @@ msgstr ""
 "Bu vosita kompyuteringizdan olib tashlamoqchi bo'lgan dasturlarni\n"
 "tanlashda sizga yordam beradi."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1906,13 +1681,11 @@ msgstr ""
 "Bu vosita kompyuteringizga o'rnatmoqchi bo'lgan yangilanishlarni tanlashda\n"
 "sizga yordam beradi."
 
-#: ../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"
@@ -1926,214 +1699,177 @@ msgstr ""
 "DVD yoki kompakt-diskda tarqatiladi. Bu vosita kompyuteringizga\n"
 "dasturlarni o'rnatish uchun ularni tanlashda sizga yordam beradi."
 
-#: ../rpmdrake.pm:101
-#, fuzzy, c-format
-msgid "Software Update"
-msgstr "Dastur paketlarini olib tashlash"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux yangilash"
 
-#: ../rpmdrake.pm:128
-#, fuzzy, c-format
+#: ../rpmdrake.pm:102
+#, fuzzy
+msgid "Software Update"
+msgstr "Dastur paketlarini olib tashlash"
+
+#: ../rpmdrake.pm:129
+#, fuzzy
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Iltimos elektron pochtangizni kiriting"
 
-#: ../rpmdrake.pm:129
-#, fuzzy, c-format
+#: ../rpmdrake.pm:130
+#, fuzzy
 msgid "User name:"
 msgstr "Foydalanuvchi:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Dastur paketlarini olib tashlash"
 
-#: ../rpmdrake.pm:171
-#, fuzzy, c-format
+#: ../rpmdrake.pm:173
+#, fuzzy
 msgid "Software Packages Update"
 msgstr "Dastur paketlarini olib tashlash"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Dastur paketlarini o'rnatish"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Yo'q"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Ha"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Ma'lumot"
 
-#: ../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 "Belgiya"
 
-#: ../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 "Shveytsariya"
 
-#: ../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 "Chex Respublikasi"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Olmoniya"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Daniya"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Gretsiya"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Ispaniya"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Finlyandiya"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Frantsiya"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Vengriya"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Isroil"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Italiya"
 
-#: ../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 "Niderlandlar"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvegiya"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Polsha"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugaliya"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Rossiya"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Shvetsiya"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../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 "Buyuk Britaniya"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Xitoy"
 
-#: ../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 "Qo'shma Shtatlar"
 
-#: ../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"
@@ -2145,8 +1881,7 @@ msgstr ""
 "\n"
 "Davom etishni istaysizmi?"
 
-#: ../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"
@@ -2158,23 +1893,26 @@ msgstr ""
 "\n"
 "Davom etishni istaysizmi?"
 
-#: ../rpmdrake.pm:515
-#, fuzzy, c-format
+#: ../rpmdrake.pm:527
+msgid "Mirror choice"
+msgstr ""
+
+#: ../rpmdrake.pm:530
+#, fuzzy
 msgid "Please wait, downloading mirror addresses."
 msgstr "Manba yangilanmoqda, iltimos kutib turing..."
 
-#: ../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 "Olishda xato ro'y berdi"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2183,8 +1921,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"
@@ -2193,18 +1931,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"
@@ -2213,69 +1948,64 @@ msgid ""
 "by Mandriva Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Iltimos istagan oynani tanlang."
 
-#: ../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 "Manba (%s) fayli tekshirilmoqda..."
 
-#: ../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 " tayyor."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " muvaffaqiyatsiz tugadi!"
 
 #. -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 fayli %s manbadan"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "\"%s\"ni olish boshlanmoqda..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "\"%s\" olinmoqda, qolgan vaqt: %s, tezlik: %s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "\"%s\" olinmoqda, tezlik: %s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Manba yangilanmoqda, iltimos kutib turing..."
 
-#: ../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"
@@ -2285,34 +2015,30 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Manbani yangilash"
 
-#: ../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 "Siz yangilamoqchi bo'lgan manbani tanlang:"
 
-#: ../rpmdrake.pm:743
-#, fuzzy, c-format
+#: ../rpmdrake.pm:759
+#, fuzzy
 msgid "Select all"
 msgstr "Tanlangan"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Yangilash"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2320,26 +2046,24 @@ 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 "Manbani yaratib bo'lmadi."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Manbani qo'shish muvaffaqiyatsiz tugadi"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2349,29 +2073,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 ""
@@ -2646,6 +2368,18 @@ msgstr "Dasturlarni olib tashlash"
 msgid "Software Media Manager"
 msgstr "Tanlash"
 
+#~ msgid "Stop"
+#~ msgstr "To'xtatish"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Hamma paketlar: manba bo'yicha"
+
+#~ msgid "Normal information"
+#~ msgstr "Qisqa ma'lumot"
+
+#~ msgid "Maximum information"
+#~ msgstr "To'liq ma'lumot"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "hamma narsa to'g'ri o'rnatildi"
 
diff --git a/po/vi.po b/po/vi.po
index 5d502448..e288f640 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-vi\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-14 09:52+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\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 "Hãy chọn loại phương tiện"
 
-#: ../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"
@@ -38,18 +37,16 @@ msgstr ""
 "các gói của phân phối Linux, hoặc nguồn cung cấp cập nhật chính thức cho\n"
 "phân phối của bạn. Bạn có thể thêm cả hai qua hai bước."
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Các nguồn của phân phối"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Cập nhật chính thức"
 
-#: ../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"
@@ -66,104 +63,86 @@ msgstr ""
 "\n"
 "Tiếp tục được chưa?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Hãy chờ, đang thêm phương tiện..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Thêm phương tiện"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Tập tin cục bộ"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Đường dẫn:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Máy chủ 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 "Máy chủ FTP"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Máy chủ HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Thiết bị tháo lắp"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Đường dẫn hoặc điểm gắn kết:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Thiết bị tháo lắp"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Duyệt..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "Đăng nhập:"
 
-#: ../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 "Mật khẩu:"
 
-#: ../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 "Đường dẫn liên quan tớ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 "Nếu để trống, synthesis/hdlist sẽ được dò tự động"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "Tên:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Tạo phương tiện cho toàn bộ phân phối"
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:214
+#, fuzzy
 msgid "Search this media for updates"
 msgstr "Hãy chọn phương tiện bạn muốn cập nhật:"
 
-#: ../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 "Bạn cần điền ít nhất là hai mục nhập đầu tiên."
 
-#: ../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?"
@@ -171,13 +150,11 @@ msgstr ""
 "Đang có một phương tiện với tên đó rồi, bạn có\n"
 "thật sự muốn thay thế nó?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Thêm phương tiện:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Loại phương tiện:"
 
@@ -185,10 +162,9 @@ msgstr "Loại phương tiện:"
 #: ../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 "Bỏ qua"
 
@@ -197,101 +173,86 @@ msgstr "Bỏ qua"
 #: ../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 "Tùy chọn chung cho việc cài đặt các gói"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "luôn luôn"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "không bao giờ"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Kiểm tra RPMs được cài đặt:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Tải xuống chương trình để dùng:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Gỡ Bỏ Nguồn Phần Mềm"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Bạn có chắc là muốn bỏ nguồn \"%s\" không?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Hãy đợi, đang gỡ bỏ phương tiện..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Biên tập phương tiện"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Biên tập phương tiện \"%s\":"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Lưu lại các thay đổi"
 
-#: ../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 "Cần nạp phương tiện để tiếp tục"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Để lưu các thay đổi, cần nạp phương tiện vào ổ."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Cấu hình các proxy"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Thiết lập proxy cho phương tiện \"%s\""
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Thiết lập proxy chung"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -300,166 +261,137 @@ msgstr ""
 "<proxyhost[:port]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy hostname:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Bạn có thể chỉ định người dùng/mật khẩu cho xác thực của proxy:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Người dùng:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Thêm nhóm song song"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Biên tập nhóm song song"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Thêm giới hạn phương tiện"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Hãy chọn phương tiện để thêm giới hạn phương tiện:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Thêm host"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Hãy nhập hostname hay địa chỉ IP để thêm:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Biên tập nhóm song song \"%s\":"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "Tên nhóm:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Giao thức:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Giới hạn phương tiện:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Thêm"
 
 #: ../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 "Gỡ Bỏ"
 
 #: ../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 "Cấu hình urpmi song song (thực thi phân phối của urpmi)"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Group"
 msgstr "Nhóm"
 
 #: ../edit-urpm-sources.pl:693
-#, c-format
-msgid "Protocol"
-msgstr "Giao thức"
-
-#: ../edit-urpm-sources.pl:693
-#, c-format
 msgid "Media limit"
 msgstr "Giới hạn phương tiện"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Giao thức"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Lệnh"
 
-#: ../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 "(không có)"
 
-#: ../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 "Hiệu chỉnh"
 
-#: ../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 "Thêm..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Quản lý khoá cho chữ ký số của các gói"
 
-#: ../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 "Phương tiện"
 
 #: ../edit-urpm-sources.pl:757
-#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Khóa"
 
 #: ../edit-urpm-sources.pl:776
-#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "không thấy tên, khoá không tồn tại trong rpm keyring!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Thêm phím"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Hãy chọn phím để thêm cho phương tiện %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Bỏ phím"
 
 #: ../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)"
@@ -468,37 +400,32 @@ msgstr ""
 "(tên khoá là: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Thêm phím..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Bỏ phím"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Cấu hình phương tiện"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "Bật chạy?"
 
-#: ../edit-urpm-sources.pl:894
-#, fuzzy, c-format
+#: ../edit-urpm-sources.pl:908
+#, fuzzy
 msgid "Updates?"
 msgstr "Cập nhật"
 
-#: ../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"
@@ -508,38 +435,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:974
-#, c-format
+#: ../edit-urpm-sources.pl:988
 msgid "Add custom..."
 msgstr "Thêm tuỳ chọn..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Cập nhật..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Quản lý phím..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Song song..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Tuỳ chọn chung..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: ../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"
@@ -549,8 +470,7 @@ msgstr ""
 "\n"
 "Có đồng ý tiếp tục không?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -564,8 +484,7 @@ msgstr ""
 "máy tính này. Chúng sẽ có sẵn để cài đặt các gói phần mềm mới hoặc thực\n"
 "hiện cập nhật."
 
-#: ../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"
@@ -577,13 +496,23 @@ msgstr ""
 "phương tiện khác trên desktop khác hay là bạn hiện cũng đang\n"
 "cài đặt các gói phần mềm?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Không thể thêm phương tiện, thiếu hoặc sai đối số"
 
-#: ../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 ""
+"Bạn sắp thêm phương tiện chứa gói tin mới, `%s'.\n"
+"Có nghĩa là bạn có thể cài thêm các gói phần mềm\n"
+"từ phương tiện mới này. "
+
+#: ../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"
@@ -593,63 +522,60 @@ msgstr ""
 "Có nghĩa là bạn có thể cài thêm các gói phần mềm\n"
 "từ phương tiện mới này. "
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Thêm phương tiện `%s' thành công."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Thêm phương tiện `%s' thành công."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Cách dùng: %s [TÙY CHỌN]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 "  --changelog-first      hiển thị changelog trước filelist trong cửa sổ mô tả"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     giới hạn cho phương tiện"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     yêu cầu hợp nhất mọi tập tin .rpmnew/.rpmsave được "
 "tìm thấy"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            đặt phương thức (cài đặt (mặc định), gỡ bỏ, cập "
 "nhật)"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      không hỏi việc khẳng định trong phương thức cập nhật"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      không cập nhật phương tiện khi khởi chạy"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        không kiểm tra chữ ký của các gói"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -657,33 +583,27 @@ msgstr ""
 "  --parallel=alias,host  là ở parallel mode, dùng nhóm \"alias\", dùng máy "
 "\"host\" để  hiển thị các phụ thuộc (deps)"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    chỉ hiển thị các gói này"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      chọn trước các gói này"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 ép chạy bằng root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           chạy tìm kiếm cho \"pkg\""
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Chạy trong chế độ người dùng"
 
-#: ../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"
@@ -693,634 +613,517 @@ msgstr ""
 "Bạn sẽ không thể thực hiện việc thay đổi hệ thống, nhưng vẫn\n"
 "có thể duyệt cơ sở dữ liệu hiện có."
 
-#: ../rpmdrake:188
-#, c-format
+#: ../rpmdrake:198
 msgid "Accessibility"
 msgstr "Hỗ trợ"
 
-#: ../rpmdrake:189 ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192
-#, c-format
+#: ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202
 msgid "Archiving"
 msgstr "Lưu trữ"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Sao lưu"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Ghi CD"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Né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 "Khác"
 
-#: ../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 "Sách"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Sách vi tính"
 
-#: ../rpmdrake:194
-#, c-format
+#: ../rpmdrake:204
 msgid "Faqs"
 msgstr "Câu hỏi hay gặp"
 
-#: ../rpmdrake:195
-#, c-format
+#: ../rpmdrake:205
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:196
-#, c-format
+#: ../rpmdrake:206
 msgid "Literature"
 msgstr "Văn học"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Kết thúc thông điệp"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Xắp hàng dịch vụ"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Viễn thông"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Cơ sở dữ liệu"
 
-#: ../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 "Phát triển"
-
-#: ../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 "Phát triển"
+
+#: ../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 "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 "Trình biên soạn"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Giáo dục"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Trình mô phỏng"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Công cụ tập tin"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Trò chơi"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Thám hiểm"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Trò chơi"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Bảng"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Bài lá"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Đố ô chữ"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Thể thao"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Chiến thuật"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Màn hình nền đồ họa"
-
-#: ../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 "Màn hình nền đồ họa"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Dựa trên 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 "Đồ họa"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Theo dõi"
 
-#: ../rpmdrake:234
-#, c-format
+#: ../rpmdrake:245
 msgid "Multimedia"
 msgstr "Đa phương tiện"
 
-#: ../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 "Chạy mạng"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Tán chuyện"
 
-#: ../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 "Chạy mạng"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Truyền tập tin"
 
-#: ../rpmdrake:237
-#, c-format
+#: ../rpmdrake:248
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:238
-#, c-format
+#: ../rpmdrake:249
 msgid "Instant messaging"
 msgstr "Thông điệp tức thời"
 
-#: ../rpmdrake:239
-#, c-format
+#: ../rpmdrake:250
 msgid "Mail"
 msgstr "Thư"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Tin tức"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Truy cập từ xa"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Văn phòng"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Khóa công cộng"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Xuất bản"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Khoa học"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Thiên văn học"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Khoa học"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Sinh học"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Hóa học"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Khoa học máy tính"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Geosciences"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Toán học"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Vật lý"
 
-#: ../rpmdrake:255
-#, c-format
+#: ../rpmdrake:266
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:256
-#, c-format
+#: ../rpmdrake:267
 msgid "Sound"
 msgstr "Âm thanh"
 
-#: ../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 "Hệ thống"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Cơ sở"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Cấu hình"
+#: ../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 "Hệ thống"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Khởi động và Khởi tạo"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Cấu hình"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Phần cứng"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Đóng gói"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "In ấn"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Hướng nghiệp"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Triển khai"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Phông chữ"
-
-#: ../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 "Phông chữ"
+
+#: ../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 "Quốc tế hóa"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Kernel và phần cứng"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Thư viện"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Máy chủ"
 
-#: ../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 "Công cụ văn bản"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Đồ chơi"
 
-#: ../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 "(Không có sẵn)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Kết quả tìm kiếm"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Kết quả tìm kiếm (không)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Hãy đợi, đang tìm kiếm..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Dừng"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Có thể thêm vào"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Có thể nâng cấp"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Có thể thêm vào"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Không được chọn"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Được chọn"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Không được chọn"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Mức độ quan trọng: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Lý do cập nhật:"
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Không có mô tả"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Tập tin:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Bản ghi thay đổi (Changelog):\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Phương tiện: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Phiên bản đã cài đặt hiện thời: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "Tên: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Phiên bản: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Kích thước: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Mức độ quan trọng: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Kích thước: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Tóm tắt: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Lý do cập nhật:"
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Mô tả: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Không có mô tả"
+#. 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 "Thêm các thông tin về gói..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Hãy chọn"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "Cần đến một trong các gói tin sau:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Hãy chọn"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Hãy đợi, đang liệt kê các gói..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Không có cập nhật"
 
-#: ../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"
@@ -1330,30 +1133,25 @@ msgstr ""
 "nào cho các gói tin đã được cài đặt hoặc là bạn đã cài đặt chúng\n"
 "rồi."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Toàn bộ"
 
 #  -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 "Thêm thông tin"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Thông tin về các gói"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Cần gỡ bỏ một số gói bổ sung"
 
-#: ../rpmdrake:758
-#, c-format
+#: ../rpmdrake:814
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -1363,13 +1161,11 @@ msgstr ""
 "bỏ:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Không thể gỡ bỏ một số gói tin"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1377,8 +1173,7 @@ msgstr ""
 "Xin lỗi, gỡ bỏ các gói này sẽ làm hỏng hệ thống của bạn:\n"
 "\n"
 
-#: ../rpmdrake: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 +1183,11 @@ msgstr ""
 "ngay bây giờ:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Cần thêm các gói bổ sung"
 
-#: ../rpmdrake:804
-#, c-format
+#: ../rpmdrake:860
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1404,18 +1197,17 @@ msgstr ""
 "cài đặt:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (theo danh sách bỏ qua)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Không thể cài đặt một số gói tin"
 
-#: ../rpmdrake:823
-#, c-format
+#: ../rpmdrake:879
+#, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1425,123 +1217,108 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:838 ../rpmdrake:1116
-#, c-format
+#: ../rpmdrake:894 ../rpmdrake:1116
 msgid "Some packages need to be removed"
 msgstr "Một số gói cần được gỡ bỏ"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Đã chọn: %d MB / Không gian đĩa trống: %d MB"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Kích thước được chọn: %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 "Không có mô tả cho gói tin này\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Cập nhật bảo mật"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Cập nhật sửa lỗi"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Cài đặt"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Cập nhật thông thường"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Cài đặt"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s lựa chọn"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Các lựa chọn của 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 "Mọi gói tin, theo bảng chữ cái"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Mọi gói tin, theo nhóm"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "Mọi gói tin, theo mức sẵn có để cập nhật"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Mọi gói tin, theo kích thước"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Mọi gói tin, theo tình trạng chọn"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Mọi gói tin, theo vị trí đặt phương tiện"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Mọi gói tin, theo mức sẵn có để cập nhật"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Chỉ bỏ đó, xếp loại theo ngày cài đặt"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Mọi gói tin, theo nhóm"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Cập nhật thông thường"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Cập nhật sửa lỗi"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Cập nhật thông thường"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Cập nhật bảo mật"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "trong các tên"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "trong các mô tả"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "theo tên tập tin"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Thông tin thông thường"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Thông tin tối đa"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Cần chọn một số gói tin trước tiên."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Có quá nhiều gói tin được chọn"
 
 #: ../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 +1335,7 @@ msgstr ""
 "Bạn có thật sự muốn cài đặt tất cả các gói đã chọn không?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1572,89 +1349,100 @@ msgstr ""
 "\n"
 "Đã được để tiếp tục chưa?"
 
-#: ../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 "/_Tệp"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Cập nhật phương tiện"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Đặt lại việc chọn"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Nạp lại danh sách các _gói"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/Th_oát"
 
-#: ../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 "/Tù_y chọn"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Tự động _hiển thị các gói đã được chọn"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/Trợ _Giúp"
 
-#: ../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 "Cập Nhật 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 "Tìm:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Xóa sạch"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Cài đặt"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Lỗi trầm trọng"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Xả ra lỗi trầm trọng: %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 +1454,12 @@ msgstr ""
 "\n"
 "Tiếp tục được chưa?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Các phương tiện cập nhật hiện đang có"
 
-#: ../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"
@@ -1688,13 +1475,12 @@ msgstr ""
 "\n"
 "Sau đó chạy lại %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Cách chọn thủ công mirror của bạn"
 
-#: ../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"
@@ -1708,58 +1494,56 @@ msgstr ""
 "\n"
 "Sau đó chạy lại %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Hãy đợi, đang tìm các gói sẵn có..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Hãy đợi, đang đọc cơ sở dữ liệu các gói..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Thẩm tra %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "các thay đổi:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Gỡ Bỏ .%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Dùng .%s là tập tin chính"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Không làm gì"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "Kết thúc cài đặt"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Thẩm tra..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Mọi gói tin yêu cầu đã được cài đặt thành công."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Trục trặc trong khi cài đặt"
 
-#: ../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"
@@ -1769,18 +1553,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Không thể lấy các gói nguồn."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Xin lỗi, không thể lấy các gói nguồn. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1792,38 +1575,34 @@ msgstr ""
 "Báo cáo lỗi:\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Cài đặt gói tin..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Đang khởi tạo..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Cài đặt gói tin..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Thay phương tiện"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Hãy nạp phương tiện có tên \"%s\" lên thiết bị [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Đang tải xuống gói tin `%s' (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Đang thẩm tra chữ ký của các gói tin..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1837,13 +1616,12 @@ msgstr ""
 "\n"
 "Bạn vẫn muốn tiếp tục cài đặt không?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "Cài đặt không được"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1855,23 +1633,22 @@ msgstr ""
 "\n"
 "Có thể bạn cần cập nhật cơ sở dữ liệu phương tiện."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Đang chuẩn bị cài đặt các gói tin..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Đang cài đặt gói tin `%s' (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "không thể truy cập tập tin rpm [%s]"
 
-#: ../rpmdrake:1700
-#, fuzzy, c-format
+#: ../rpmdrake:1797
+#, fuzzy
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1883,43 +1660,33 @@ msgstr ""
 "Một số tập tin cấu hình được tạo là `.rpmnew' hay `.rpmsave',\n"
 "Bây giờ bạn có thể kiểm tra một số tập tin đó để tạo các hoạt động:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Các gói tin này có thông tin nâng cấp đi kèm."
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Thêm các thông tin về gói... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Không tìm thấy gói tin để cài đặt."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Lỗi không thể khắc phục: không tìm thấy gói để cài đặt, xin lỗi."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Hãy đợi, đang đọc cơ sở dữ liệu các gói..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Hãy đợi, đang gỡ bỏ các gói..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Có trục trặc khi gỡ bỏ"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1929,8 +1696,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1942,8 +1708,8 @@ msgstr ""
 "Công cụ này giúp bạn chọn phần mềm nào muốn gỡ bỏ khỏi máy tính\n"
 "của bạn."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1955,13 +1721,11 @@ msgstr ""
 "Công cụ này giúp bạn chọn các cập nhật mà bạn muốn cài đặt lên\n"
 "máy tính."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Chào mừng công cụ cài đặt phần mềm!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1975,214 +1739,172 @@ msgstr ""
 "CDROM hay DVD. Công cụ này giúp bạn chọn phần mềm nào mà bạn\n"
 "muốn cài đặt vào máy tính của bạn."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Cập nhật phần mềm"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Cập Nhật Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Cập nhật phần mềm"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Hãy nhập các yêu cầu để truy cập proxy\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "Tên người dùng:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Gỡ Bỏ Các Gói Phần Mềm"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Cập Nhật Các Gói Phần Mềm"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Cài đặt các gói phần mềm"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Không"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Có"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Thông tin..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Áo"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Châu úc"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Bỉ"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: ../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 "Czech Republic"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Germany"
 
-#: ../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 "Hy lạp"
 
-#: ../rpmdrake.pm:387
-#, c-format
+#: ../rpmdrake.pm:392
 msgid "Spain"
 msgstr "Tây ban nha"
 
-#: ../rpmdrake.pm:388
-#, c-format
+#: ../rpmdrake.pm:393
 msgid "Finland"
 msgstr "Phần Lan"
 
-#: ../rpmdrake.pm:389
-#, c-format
+#: ../rpmdrake.pm:394
 msgid "France"
 msgstr "Pháp"
 
-#: ../rpmdrake.pm:391
-#, c-format
+#: ../rpmdrake.pm:396
 msgid "Hungary"
 msgstr "Hungary"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Ý"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Nhật"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Nam Triều Tiên"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Na Uy"
 
-#: ../rpmdrake.pm:398
-#, c-format
+#: ../rpmdrake.pm:403
 msgid "Poland"
 msgstr "Ba Lan"
 
-#: ../rpmdrake.pm:399
-#, c-format
+#: ../rpmdrake.pm:404
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:400
-#, c-format
+#: ../rpmdrake.pm:405
 msgid "Russia"
 msgstr "Nga"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Thụy Điển"
 
-#: ../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 "Đài Loan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Liên Hiệp Anh"
 
-#: ../rpmdrake.pm:406
-#, c-format
+#: ../rpmdrake.pm:411
 msgid "China"
 msgstr "Trung Quốc"
 
-#: ../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 "Hoa Kỳ"
 
-#: ../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"
@@ -2194,8 +1916,7 @@ msgstr ""
 "\n"
 "Nó có tốt để tiếp tục không?"
 
-#: ../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"
@@ -2207,23 +1928,26 @@ msgstr ""
 "\n"
 "Nó có tốt để tiếp tục không?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s lựa chọn"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Hãy đợi, đang tải xuống các địa chỉ mirror."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Hãy đợi, đang tải xuống các địa chỉ mirror từ website của 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 "Lỗi khi đang tải xuống"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2237,8 +1961,8 @@ msgstr ""
 "Mạng hay website hiện thời có thể không có.\n"
 "Xin hãy thử lại sau."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2252,18 +1976,15 @@ msgstr ""
 "Mạng hay website của Mandriva hiện thời có thể không có.\n"
 "Xin hãy thử lại sau."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Không có mirror"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Không thể tìm thấy mirror thích hợp."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2277,69 +1998,64 @@ msgstr ""
 "kiến trúc của bộ vi xử lý của bạn không được hỗ trợ bởi Cập Nhật\n"
 "Chính Thức Của Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Hãy chọn mirror mong muốn."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Đang sao chép tập tin cho phương tiện `%s'..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Đang kiểm tra tập tin của phương tiện `%s'..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Đang kiểm tra tập tin ở xa của phương tiện `%s'..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " hoàn thành."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " không được!"
 
 #. -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 từ phương tiện %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Đang bắt đầu tải về `%s'..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Tải xuống của `%s', thời gian tải:%s, tốc độ:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Tải xuống của `%s', tốc độ:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Hãy đợi, đang cập nhật phương tiện..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Lỗi lấy về các gói tin"
 
-#: ../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 +2070,29 @@ msgstr ""
 "hoặc là do chưa truy cập được phương tiện, hãy thử lại sau.\n"
 "  "
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Phương tiện cập nhật"
 
-#: ../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 "Hãy chọn phương tiện bạn muốn cập nhật:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Chọn toàn bộ"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Cập nhật"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2393,8 +2104,8 @@ msgstr ""
 "Lỗi:\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 +2115,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Không thể tạo phương tiện."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Lỗi khi thêm phương tiện"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2425,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"
@@ -2436,8 +2145,8 @@ msgstr ""
 "s).\n"
 "Nó sẽ không hoạt động."
 
-#: ../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"
@@ -2447,13 +2156,11 @@ msgstr ""
 "chạy (%s).\n"
 "Nó sẽ không được hoạt động."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Đã chạy trợ giúp ở nền"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "Cửa sổ trợ giúp đã chạy, nó sẽ xuất hiện nhanh trên màn hình nền."
@@ -2728,6 +2435,18 @@ msgstr "Gỡ Bỏ Phần Mềm"
 msgid "Software Media Manager"
 msgstr "Trình Quản Lý Nguồn Phần Mềm"
 
+#~ msgid "Stop"
+#~ msgstr "Dừng"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Mọi gói tin, theo vị trí đặt phương tiện"
+
+#~ msgid "Normal information"
+#~ msgstr "Thông tin thông thường"
+
+#~ msgid "Maximum information"
+#~ msgstr "Thông tin tối đa"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "mọi thứ đã được cài đặt đúng"
 
diff --git a/po/wa.po b/po/wa.po
index 94f7830f..ab6a8cc4 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,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-04-02 16:13+0200\n"
 "Last-Translator: Lucyin Mahin <lucyin@walon.org>\n"
 "Language-Team: Walon <linux-wa@walon.org>\n"
@@ -21,13 +22,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ../edit-urpm-sources.pl:75
-#, c-format
+#: ../edit-urpm-sources.pl:76
 msgid "Choose media type"
 msgstr "Tchoezixhoz l' sôre di sopoirt"
 
-#: ../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 ""
 "distribucion. (Vos ploz eto radjouter les deus sôres, mins vos l' divoz fé e "
 "deus côps)."
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Distribution sources"
 msgstr "Sourdants del distribucion"
 
-#: ../edit-urpm-sources.pl:84
-#, c-format
+#: ../edit-urpm-sources.pl:85
 msgid "Official updates"
 msgstr "Metaedjes a djoû oficirs"
 
-#: ../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,106 +77,86 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../edit-urpm-sources.pl:96
-#, c-format
+#: ../edit-urpm-sources.pl:98
 msgid "Please wait, adding media..."
 msgstr "Tårdjîz on pô s' i vs plait, radjoutaedje do sopoirt..."
 
-#: ../edit-urpm-sources.pl:128
-#, c-format
+#: ../edit-urpm-sources.pl:130
 msgid "Add a medium"
 msgstr "Radjouter on sopoirt"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Local files"
 msgstr "Fitchîs locås"
 
-#: ../edit-urpm-sources.pl:130
-#, c-format
+#: ../edit-urpm-sources.pl:132
 msgid "Path:"
 msgstr "Tchimin:"
 
-#: ../edit-urpm-sources.pl:131
-#, c-format
+#: ../edit-urpm-sources.pl:133
 msgid "FTP server"
 msgstr "Sierveu 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 "Hårdêye:"
 
-#: ../edit-urpm-sources.pl:132
-#, c-format
+#: ../edit-urpm-sources.pl:134
 msgid "RSYNC server"
 msgstr "Sierveu RSYNC"
 
-#: ../edit-urpm-sources.pl:133
-#, c-format
+#: ../edit-urpm-sources.pl:135
 msgid "HTTP server"
 msgstr "Sierveu HTTP"
 
-#: ../edit-urpm-sources.pl:134
-#, c-format
-msgid "Removable device"
-msgstr "Bodjåve sopoirt"
-
-#: ../edit-urpm-sources.pl:134
-#, c-format
+#: ../edit-urpm-sources.pl:136
 msgid "Path or mount point:"
 msgstr "Tchimin ou pont di montaedje:"
 
-#: ../edit-urpm-sources.pl:150
-#, c-format
+#: ../edit-urpm-sources.pl:136
+msgid "Removable device"
+msgstr "Bodjåve sopoirt"
+
+#: ../edit-urpm-sources.pl:155
 msgid "Browse..."
 msgstr "Foyter..."
 
-#: ../edit-urpm-sources.pl:180
-#, c-format
+#: ../edit-urpm-sources.pl:183
 msgid "Login:"
 msgstr "No d' elodjaedje:"
 
-#: ../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 "Sicret:"
 
-#: ../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 "Tchimin relatif pol fitchî di sinteze ou 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 l' tchamp est leyî vude, li fitchî di sinteze/hdlist serè cwerou "
 "otomaticmint"
 
-#: ../edit-urpm-sources.pl:192
-#, c-format
+#: ../edit-urpm-sources.pl:195
 msgid "Name:"
 msgstr "No:"
 
 #: ../edit-urpm-sources.pl:203
-#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Fé on sopoirt po ene distribucion etire"
 
-#: ../edit-urpm-sources.pl:217
-#, c-format
+#: ../edit-urpm-sources.pl:214
 msgid "Search this media for updates"
 msgstr "Cweri après des metaedjes a djoû e ç' sopoirt ci"
 
-#: ../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 "Vos dvoz rimpli pol moens les deus prumirès intrêyes."
 
-#: ../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 +164,11 @@ msgstr ""
 "I gn a ddja on sopoirt avou ç' no la,\n"
 "el voloz vs vormint replaecî?"
 
-#: ../edit-urpm-sources.pl:243
-#, c-format
+#: ../edit-urpm-sources.pl:239
 msgid "Adding a medium:"
 msgstr "Radjoutant on sopoirt:"
 
-#: ../edit-urpm-sources.pl:244
-#, c-format
+#: ../edit-urpm-sources.pl:241
 msgid "Type of medium:"
 msgstr "Sôre di sopoirt:"
 
@@ -201,10 +176,9 @@ msgstr "Sôre di sopoirt:"
 #: ../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 "Rinoncî"
 
@@ -213,101 +187,86 @@ msgstr "Rinoncî"
 #: ../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 "'l est bon"
 
 #: ../edit-urpm-sources.pl:308
-#, c-format
 msgid "Global options for package installation"
 msgstr "Tchuzes globåles po l' astalaedje des pacaedjes"
 
 #: ../edit-urpm-sources.pl:310
-#, c-format
 msgid "always"
 msgstr "tofer"
 
 #: ../edit-urpm-sources.pl:311
-#, c-format
 msgid "never"
 msgstr "måy"
 
 #: ../edit-urpm-sources.pl:320
-#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifyî les RPM a-z astaler:"
 
 #: ../edit-urpm-sources.pl:321
-#, c-format
 msgid "Download program to use:"
 msgstr "Programe a-z eployî po les aberwetaedjes:"
 
 #: ../edit-urpm-sources.pl:351
-#, c-format
 msgid "Source Removal"
 msgstr "Oistaedje d' on sourdant"
 
 #: ../edit-urpm-sources.pl:352
-#, c-format
+#, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Estoz vs seur di voleur oister l' sourdant «%s»?"
 
 #: ../edit-urpm-sources.pl:357
-#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Tårdjîz on pô s' i vs plait, dji oistêye on sopoirt..."
 
 #: ../edit-urpm-sources.pl:394
-#, c-format
 msgid "Edit a medium"
 msgstr "Candjî on sopoirt"
 
 #: ../edit-urpm-sources.pl:400
-#, c-format
+#, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Dji candje li sopoirt «%s»:"
 
 #: ../edit-urpm-sources.pl:414
-#, c-format
 msgid "Save changes"
 msgstr "Schaper les candjmints"
 
-#: ../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 "Procsi..."
 
 #: ../edit-urpm-sources.pl:433
-#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Vos dvoz mete li sopoirt dins l' lijheu po continouwer"
 
 #: ../edit-urpm-sources.pl:434
-#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Po pleur schaper les candjmints, vos dvoz mete li sopoirt e l' lijheu."
 
 #: ../edit-urpm-sources.pl:455
-#, c-format
 msgid "Configure proxies"
 msgstr "Apontyî les procsis"
 
 #: ../edit-urpm-sources.pl:465
-#, c-format
+#, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Apontiaedjes di procsi pol sopoirt «%s»"
 
 #: ../edit-urpm-sources.pl:466
-#, c-format
 msgid "Global proxy settings"
 msgstr "Apontiaedjes di procsi globås"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -316,168 +275,139 @@ msgstr ""
 "pôrt a-z eployî (sintacse: <lodjoe_proxy[:pôrt]>):"
 
 #: ../edit-urpm-sources.pl:471
-#, c-format
 msgid "Proxy hostname:"
 msgstr "No d' lodjoe do procsi:"
 
 #: ../edit-urpm-sources.pl:474
-#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Vos ploz dner èn uzeu et si scret po l' otintifiaedje sol procsi:"
 
 #: ../edit-urpm-sources.pl:477
-#, c-format
 msgid "User:"
 msgstr "Uzeu:"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Add a parallel group"
 msgstr "Radjouter on groupe paralele"
 
 #: ../edit-urpm-sources.pl:545
-#, c-format
 msgid "Edit a parallel group"
 msgstr "Candjî on groupe paralele"
 
 #: ../edit-urpm-sources.pl:556
-#, c-format
 msgid "Add a medium limit"
 msgstr "Radjouter ene limite di sopoirt"
 
 #: ../edit-urpm-sources.pl:568
-#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Tchoezixhoz on sopoirt pol radjouter al limite des sopoirts:"
 
 #: ../edit-urpm-sources.pl:605
-#, c-format
 msgid "Add a host"
 msgstr "Radjouter on lodjoe"
 
 #: ../edit-urpm-sources.pl:611
-#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Tapez li no ou l' adresse do lodjoe ki vos vloz radjouter:"
 
 #: ../edit-urpm-sources.pl:642
-#, c-format
+#, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Dji candje li groupe paralele «%s»:"
 
 #: ../edit-urpm-sources.pl:646
-#, c-format
 msgid "Group name:"
 msgstr "No do groupe:"
 
 #: ../edit-urpm-sources.pl:647
-#, c-format
 msgid "Protocol:"
 msgstr "Protocole:"
 
 #: ../edit-urpm-sources.pl:649
-#, c-format
 msgid "Media limit:"
 msgstr "Limite do sopoirt:"
 
 #: ../edit-urpm-sources.pl:654 ../edit-urpm-sources.pl:661
-#, c-format
 msgid "Add"
 msgstr "Radjouter"
 
 #: ../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 "Oister"
 
 #: ../edit-urpm-sources.pl:656
-#, c-format
 msgid "Hosts:"
 msgstr "Lodjoe:"
 
 #: ../edit-urpm-sources.pl:690
-#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Apontyî li urpmi paralele (urpmi ovrant so pus d' ene éndjole)"
 
 #: ../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 "Limite do sopoirt"
 
+#: ../edit-urpm-sources.pl:693
+msgid "Protocol"
+msgstr "Protocole"
+
 #: ../edit-urpm-sources.pl:694
-#, c-format
 msgid "Command"
 msgstr "Comande"
 
-#: ../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 "(nole)"
 
-#: ../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 "Candjî..."
 
-#: ../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 "Radjouter..."
 
 #: ../edit-urpm-sources.pl:748
-#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Manaedjî les clés eployeyes po les sinateures des pacaedjes"
 
-#: ../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 "Sopoirt"
 
 #: ../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 ""
 "li no n' a nén stî trové, li clé n' egzistêye nén dins l' anea di clés da "
 "rpm!"
 
 #: ../edit-urpm-sources.pl:789
-#, c-format
 msgid "Add a key"
 msgstr "Radjouter ene clé"
 
 #: ../edit-urpm-sources.pl:801
-#, c-format
+#, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Tchoezixhoz ene clé a radjouter pol sopoirt %s"
 
 #: ../edit-urpm-sources.pl:829
-#, c-format
 msgid "Remove a key"
 msgstr "Oister ene 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)"
@@ -486,37 +416,31 @@ msgstr ""
 "(no del clé: %s)"
 
 #: ../edit-urpm-sources.pl:848
-#, c-format
 msgid "Add a key..."
 msgstr "Radjouter ene clé..."
 
 #: ../edit-urpm-sources.pl:852
-#, c-format
 msgid "Remove key"
 msgstr "Oister l' clé"
 
 #: ../edit-urpm-sources.pl:868
-#, c-format
 msgid "Configure media"
 msgstr "Apontyî les sopoirts"
 
-#: ../edit-urpm-sources.pl:893
-#, c-format
+#: ../edit-urpm-sources.pl:907
 msgid "Enabled?"
 msgstr "En alaedje?"
 
-#: ../edit-urpm-sources.pl:894
-#, c-format
+#: ../edit-urpm-sources.pl:908
 msgid "Updates?"
 msgstr "Metaedjes a djoû?"
 
-#: ../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 "Ci sopoirt chal a mezåjhe d' esse metou a djoû. El fé?"
 
-#: ../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 "Radjouter da vosse..."
 
-#: ../edit-urpm-sources.pl:978
-#, c-format
+#: ../edit-urpm-sources.pl:992
 msgid "Update..."
 msgstr "Mete a djoû..."
 
-#: ../edit-urpm-sources.pl:981
-#, c-format
+#: ../edit-urpm-sources.pl:995
 msgid "Manage keys..."
 msgstr "Manaedjî les clés..."
 
-#: ../edit-urpm-sources.pl:983
-#, c-format
+#: ../edit-urpm-sources.pl:997
 msgid "Parallel..."
 msgstr "Paralele..."
 
-#: ../edit-urpm-sources.pl:984
-#, c-format
+#: ../edit-urpm-sources.pl:998
 msgid "Global options..."
 msgstr "Tchuzes globåles..."
 
-#: ../edit-urpm-sources.pl:994
-#, c-format
+#: ../edit-urpm-sources.pl:1008
 msgid "Help"
 msgstr "Aidance"
 
-#: ../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"
 "C' est bon di continouwer?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -582,8 +499,7 @@ msgstr ""
 "eployî e vosse copiutrece. I sront-st adon disponibes po l' astalaedje di "
 "pacaedjes di noveas programes ou po les metaedjes a djoû."
 
-#: ../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"
@@ -595,13 +511,23 @@ msgstr ""
 "d' astalaedje so èn ôte sicribanne, oudonbén estoz vs astalant des pacaedjes "
 "pol moumint?)."
 
-#: ../gurpmi.addmedia:70
-#, c-format
+#: ../gurpmi.addmedia:87
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Dji n' sai radjouter l' sopoirt, les årgumints sont crons ou mankèt"
 
-#: ../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 ""
+"Vos alez radjouter on novea sopoirt d' astalaedje, «%s».\n"
+"Ça vout dire ki vos pôroz astaler des noveas pacaedjes di programas so "
+"vosses sistinme a pårti d' ci sopoirt ci."
+
+#: ../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"
@@ -611,18 +537,22 @@ msgstr ""
 "Ça vout dire ki vos pôroz astaler des noveas pacaedjes di programas so "
 "vosses sistinme a pårti d' ci sopoirt ci."
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, fuzzy, perl-format
+msgid "Successfully added media %s."
+msgstr "Li sopoirt «%s» a stî radjouté comifåt."
+
+#: ../gurpmi.addmedia:130
+#, perl-format
 msgid "Successfully added medium `%s'."
 msgstr "Li sopoirt «%s» a stî radjouté comifåt."
 
-#: ../rpmdrake:35
-#, c-format
+#: ../rpmdrake:38
+#, perl-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Po s' è siervi: %s [TCHUZES]..."
 
-#: ../rpmdrake:36
-#, c-format
+#: ../rpmdrake:39
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -630,46 +560,39 @@ msgstr ""
 "  --changelog-first      håyner l' djivêye des candjmints divant l' djivêye "
 "des fitchîs"
 
-#: ../rpmdrake:37
-#, c-format
+#: ../rpmdrake:40
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=sopoirt1,...   si limiter ås sopoirts dinés"
 
-#: ../rpmdrake:38
-#, c-format
+#: ../rpmdrake:41
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     propôze di mete fé on seu fitchî avou tos les ."
 "rpmnew/.rpmsave trovés"
 
-#: ../rpmdrake:39
-#, c-format
+#: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MÔDE            definixh li môde («install» (astalaedje, prémetou), "
 "«remove» (oister), «update» (mete a djoû))"
 
-#: ../rpmdrake:40
-#, c-format
+#: ../rpmdrake:43
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      èn nén dmander d' acertiner e môde metaedje a djoû"
 
-#: ../rpmdrake:41
-#, c-format
+#: ../rpmdrake:44
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 "  --no-media-update      èn nén mete a djoû les sopoirts a l' enondaedje"
 
-#: ../rpmdrake:42
-#, c-format
+#: ../rpmdrake:45
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        èn nén verifyî les sinateures des pacaedjes"
 
-#: ../rpmdrake:43
-#, c-format
+#: ../rpmdrake:46
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -677,33 +600,27 @@ msgstr ""
 "  --parallel=alias,host  esse e môde paralele, avou l' groupe «alias» eyet "
 "l' lodjoe «host» po mostrer les depindinces k' i fåt"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    mostrer seulmint ces pacaedjes la"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      pré-tchoezi ces pacaedjes la"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 foirci l' programe a s' enonder dzo root"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           enonder on cweraedje po «pkg»"
 
-#: ../rpmdrake:178
-#, c-format
+#: ../rpmdrake:188
 msgid "Running in user mode"
 msgstr "Enondé e môde uzeu"
 
-#: ../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"
@@ -713,634 +630,517 @@ msgstr ""
 "Vos n' pôroz nén fé des candjmints do sistinme, mins vos ploz tot l' minme "
 "vey çou k' i gn a el båze di dnêyes."
 
-#: ../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 "Årtchivaedje"
 
-#: ../rpmdrake:189
-#, c-format
+#: ../rpmdrake:199
 msgid "Backup"
 msgstr "Copeyes di såvrité"
 
-#: ../rpmdrake:190
-#, c-format
+#: ../rpmdrake:200
 msgid "Cd burning"
 msgstr "Broûlaedje di CDs"
 
-#: ../rpmdrake:191
-#, c-format
+#: ../rpmdrake:201
 msgid "Compression"
 msgstr "Rastrindaedje"
 
-#: ../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 "Ôte"
 
-#: ../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 "Lives"
 
-#: ../rpmdrake:193
-#, c-format
+#: ../rpmdrake:203
 msgid "Computer books"
 msgstr "Lives d' informatike"
 
-#: ../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 "Belès letes"
 
-#: ../rpmdrake:198 ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:208 ../rpmdrake:209
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:198
-#, c-format
+#: ../rpmdrake:208
 msgid "Message Passing"
 msgstr "Passaedje di messaedjes"
 
-#: ../rpmdrake:199
-#, c-format
+#: ../rpmdrake:209
 msgid "Queueing Services"
 msgstr "Siervices di cawêyes"
 
-#: ../rpmdrake:200
-#, c-format
+#: ../rpmdrake:210
 msgid "Communications"
 msgstr "Comunicåcions"
 
-#: ../rpmdrake:201 ../rpmdrake:204
-#, c-format
+#: ../rpmdrake:211 ../rpmdrake:214
 msgid "Databases"
 msgstr "Båzes di dnêyes"
 
-#: ../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 "Programaedje"
-
-#: ../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 "Programaedje"
+
+#: ../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 "Nawea"
 
-#: ../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 "Aspougneus di tecse"
 
-#: ../rpmdrake:213
-#, c-format
+#: ../rpmdrake:224
 msgid "Education"
 msgstr "Acsegnmint"
 
-#: ../rpmdrake:214
-#, c-format
+#: ../rpmdrake:225
 msgid "Emulators"
 msgstr "Emulateus"
 
-#: ../rpmdrake:215
-#, c-format
+#: ../rpmdrake:226
 msgid "File tools"
 msgstr "Usteyes po fitchîs"
 
-#: ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218 ../rpmdrake:219
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#, c-format
-msgid "Games"
-msgstr "Djeus"
-
-#: ../rpmdrake:216
-#, c-format
+#: ../rpmdrake:227
 msgid "Adventure"
 msgstr "Advinteure"
 
-#: ../rpmdrake:217
-#, c-format
+#: ../rpmdrake:227 ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+msgid "Games"
+msgstr "Djeus"
+
+#: ../rpmdrake:228
 msgid "Arcade"
 msgstr "Årcåde"
 
-#: ../rpmdrake:218
-#, c-format
+#: ../rpmdrake:229
 msgid "Boards"
 msgstr "Djeus d' platea"
 
-#: ../rpmdrake:219
-#, c-format
+#: ../rpmdrake:230
 msgid "Cards"
 msgstr "Cwårdjeus"
 
-#: ../rpmdrake:221
-#, c-format
+#: ../rpmdrake:232
 msgid "Puzzles"
 msgstr "Puzeles"
 
-#: ../rpmdrake:222
-#, c-format
+#: ../rpmdrake:233
 msgid "Sports"
 msgstr "Spôrts"
 
-#: ../rpmdrake:223
-#, c-format
+#: ../rpmdrake:234
 msgid "Strategy"
 msgstr "Sitratedjeye"
 
-#: ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226 ../rpmdrake:227
-#: ../rpmdrake:228 ../rpmdrake:229 ../rpmdrake:230 ../rpmdrake:231
-#, c-format
-msgid "Graphical desktop"
-msgstr "Sicribanne"
-
-#: ../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 "Sicribanne"
+
+#: ../rpmdrake:236
 msgid "FVWM based"
 msgstr "Båzés so 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 "Dessinaedjes"
 
-#: ../rpmdrake:233
-#, c-format
+#: ../rpmdrake:244
 msgid "Monitoring"
 msgstr "Corwaitaedje"
 
-#: ../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 "Rantoele"
-
-#: ../rpmdrake:235
-#, c-format
+#: ../rpmdrake:246
 msgid "Chat"
 msgstr "Tchate"
 
-#: ../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 "Rantoele"
+
+#: ../rpmdrake:247
 msgid "File transfer"
 msgstr "Transfer di fitchîs"
 
-#: ../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 "Emilaedje"
 
-#: ../rpmdrake:240
-#, c-format
+#: ../rpmdrake:251
 msgid "News"
 msgstr "Copinreyes (newsgroups)"
 
-#: ../rpmdrake:242
-#, c-format
+#: ../rpmdrake:253
 msgid "Remote access"
 msgstr "Accès då lon"
 
-#: ../rpmdrake:243
-#, c-format
+#: ../rpmdrake:254
 msgid "WWW"
 msgstr "Waibe"
 
-#: ../rpmdrake:244
-#, c-format
+#: ../rpmdrake:255
 msgid "Office"
 msgstr "Buro"
 
-#: ../rpmdrake:245
-#, c-format
+#: ../rpmdrake:256
 msgid "Public Keys"
 msgstr "Clés publikes"
 
-#: ../rpmdrake:246
-#, c-format
+#: ../rpmdrake:257
 msgid "Publishing"
 msgstr "Eplaidaedje"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#, c-format
-msgid "Sciences"
-msgstr "Siyinces"
-
-#: ../rpmdrake:247
-#, c-format
+#: ../rpmdrake:258
 msgid "Astronomy"
 msgstr "Astronomeye"
 
-#: ../rpmdrake:248
-#, c-format
+#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:262 ../rpmdrake:263 ../rpmdrake:264 ../rpmdrake:265
+msgid "Sciences"
+msgstr "Siyinces"
+
+#: ../rpmdrake:259
 msgid "Biology"
 msgstr "Biyolodjeye"
 
-#: ../rpmdrake:249
-#, c-format
+#: ../rpmdrake:260
 msgid "Chemistry"
 msgstr "Tchimeye"
 
-#: ../rpmdrake:250
-#, c-format
+#: ../rpmdrake:261
 msgid "Computer science"
 msgstr "Informatike"
 
-#: ../rpmdrake:251
-#, c-format
+#: ../rpmdrake:262
 msgid "Geosciences"
 msgstr "Siyinces del Daegn"
 
-#: ../rpmdrake:252
-#, c-format
+#: ../rpmdrake:263
 msgid "Mathematics"
 msgstr "Matematike"
 
-#: ../rpmdrake:254
-#, c-format
+#: ../rpmdrake:265
 msgid "Physics"
 msgstr "Fizike"
 
-#: ../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 "Sistinme"
-
-#: ../rpmdrake:257
-#, c-format
+#: ../rpmdrake:268
 msgid "Base"
 msgstr "Båze"
 
-#: ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:262 ../rpmdrake:263
-#, c-format
-msgid "Configuration"
-msgstr "Apontiaedje"
+#: ../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 "Sistinme"
 
-#: ../rpmdrake:258
-#, c-format
+#: ../rpmdrake:269
 msgid "Boot and Init"
 msgstr "Enondaedje del éndjole"
 
-#: ../rpmdrake:259
-#, c-format
+#: ../rpmdrake:269 ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272
+#: ../rpmdrake:273 ../rpmdrake:274
+msgid "Configuration"
+msgstr "Apontiaedje"
+
+#: ../rpmdrake:270
 msgid "Hardware"
 msgstr "Éndjolreye"
 
-#: ../rpmdrake:262
-#, c-format
+#: ../rpmdrake:273
 msgid "Packaging"
 msgstr "Manaedjmint des pacaedjes"
 
-#: ../rpmdrake:263
-#, c-format
+#: ../rpmdrake:274
 msgid "Printing"
 msgstr "Imprimaedje"
 
-#: ../rpmdrake:264
-#, c-format
+#: ../rpmdrake:275
 msgid "Deploiement"
 msgstr "Disployaedje"
 
-#: ../rpmdrake:265
-#, c-format
+#: ../rpmdrake:276
 msgid "Deployment"
 msgstr "Disployaedje"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#, c-format
-msgid "Fonts"
-msgstr "Fontes"
-
-#: ../rpmdrake:266
-#, c-format
+#: ../rpmdrake:277
 msgid "Console"
 msgstr "Conzôle"
 
-#: ../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 "Bitmap X11"
 
-#: ../rpmdrake:270
-#, c-format
+#: ../rpmdrake:281
 msgid "Internationalization"
 msgstr "Eternåcionålijhaedje"
 
-#: ../rpmdrake:271
-#, c-format
+#: ../rpmdrake:282
 msgid "Kernel and hardware"
 msgstr "Nawea eyet éndjolreye"
 
-#: ../rpmdrake:272
-#, c-format
+#: ../rpmdrake:283
 msgid "Libraries"
 msgstr "Livreyes"
 
-#: ../rpmdrake:273
-#, c-format
+#: ../rpmdrake:284
 msgid "Servers"
 msgstr "Sierveus"
 
-#: ../rpmdrake:274
-#, c-format
+#: ../rpmdrake:285
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:275
-#, c-format
+#: ../rpmdrake:286
 msgid "Terminals"
 msgstr "Terminås"
 
-#: ../rpmdrake:276
-#, c-format
+#: ../rpmdrake:287
 msgid "Text tools"
 msgstr "Usteyes tecse"
 
-#: ../rpmdrake:277
-#, c-format
+#: ../rpmdrake:288
 msgid "Toys"
 msgstr "Djouwets"
 
-#: ../rpmdrake:278
-#, c-format
+#: ../rpmdrake:289
 msgid "Video"
 msgstr "Videyo"
 
-#: ../rpmdrake:410 ../rpmdrake:556 ../rpmdrake:558
-#, c-format
+#. - to highlight information
+#: ../rpmdrake:417 ../rpmdrake:589 ../rpmdrake:591
 msgid "(Not available)"
 msgstr "(Nén disponibe)"
 
-#: ../rpmdrake:439 ../rpmdrake:520
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results"
 msgstr "Rizultats do cweraedje"
 
-#: ../rpmdrake:439
-#, c-format
+#: ../rpmdrake:446
 msgid "Search results (none)"
 msgstr "Rizultats do cweraedje (nouk)"
 
-#: ../rpmdrake:450 ../rpmdrake:478
-#, c-format
+#: ../rpmdrake:457
 msgid "Please wait, searching..."
 msgstr "Tårdjîz on pô s' i vs plait, dji cwir..."
 
-#: ../rpmdrake:473 ../rpmdrake:600 ../rpmdrake:1285 ../rpmdrake:1619
-#: ../rpmdrake:1851
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:483
-#, c-format
-msgid "Stop"
-msgstr "Arester"
+#: ../rpmdrake:529 ../rpmdrake:746
+msgid "Addable"
+msgstr "Pout esse radjouté"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
+#: ../rpmdrake:529 ../rpmdrake:746
 msgid "Upgradable"
 msgstr "Pout esse metou a djoû"
 
-#: ../rpmdrake:521 ../rpmdrake:690
-#, c-format
-msgid "Addable"
-msgstr "Pout esse radjouté"
+#: ../rpmdrake:531
+msgid "Not selected"
+msgstr "Nén tchoezi"
 
-#: ../rpmdrake:523
-#, c-format
+#: ../rpmdrake:531
 msgid "Selected"
 msgstr "Tchoezi"
 
-#: ../rpmdrake:523
-#, c-format
-msgid "Not selected"
-msgstr "Nén tchoezi"
+#: ../rpmdrake:574 ../rpmdrake:607
+msgid "Importance: "
+msgstr "Impôrtance: "
 
-#: ../rpmdrake:553
-#, c-format
+#: ../rpmdrake:575 ../rpmdrake:615
+msgid "Reason for update: "
+msgstr "Råjhon do metaedje a djoû: "
+
+#. extra empty line
+#: ../rpmdrake:578 ../rpmdrake:617
+msgid "No description"
+msgstr "Nou discrijhaedje"
+
+#: ../rpmdrake:586
 msgid "Files:\n"
 msgstr "Fitchîs:\n"
 
-#: ../rpmdrake:558
-#, c-format
+#: ../rpmdrake:591
 msgid "Changelog:\n"
 msgstr "Djournå des candjmints:\n"
 
-#: ../rpmdrake:563
-#, c-format
+#: ../rpmdrake:596
 msgid "Medium: "
 msgstr "Sopoirt: "
 
-#: ../rpmdrake:565
-#, c-format
+#: ../rpmdrake:597
 msgid "Currently installed version: "
 msgstr "Modêye d' astalêye: "
 
-#: ../rpmdrake:573
-#, c-format
+#: ../rpmdrake:601
 msgid "Name: "
 msgstr "No do pacaedje: "
 
-#: ../rpmdrake:574
-#, c-format
+#: ../rpmdrake:602
 msgid "Version: "
 msgstr "Modêye: "
 
-#: ../rpmdrake:575
-#, c-format
+#: ../rpmdrake:603
 msgid "Architecture: "
 msgstr "Årtchitecteure: "
 
-#: ../rpmdrake:576
-#, c-format
-msgid "Size: "
-msgstr "Grandeu: "
-
-#: ../rpmdrake:576
-#, c-format
+#: ../rpmdrake:604
+#, perl-format
 msgid "%s KB"
 msgstr "%s Ko"
 
-#: ../rpmdrake:579
-#, c-format
-msgid "Importance: "
-msgstr "Impôrtance: "
+#: ../rpmdrake:604
+msgid "Size: "
+msgstr "Grandeu: "
 
-#: ../rpmdrake:582
-#, c-format
+#. extra empty line
+#: ../rpmdrake:611
 msgid "Summary: "
 msgstr "Rascourti: "
 
-#: ../rpmdrake:585
-#, c-format
-msgid "Reason for update: "
-msgstr "Råjhon do metaedje a djoû: "
-
-#: ../rpmdrake:587
-#, c-format
+#: ../rpmdrake:617
 msgid "Description: "
 msgstr "Discrijhaedje: "
 
-#: ../rpmdrake:587
-#, c-format
-msgid "No description"
-msgstr "Nou discrijhaedje"
+#. 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 "Pus d' informåcions sol pacaedje..."
 
-#: ../rpmdrake:618
-#, c-format
-msgid "Please choose"
-msgstr "Tchoezixhoz s' i vs plait"
-
-#: ../rpmdrake:618
-#, c-format
+#: ../rpmdrake:672
 msgid "One of the following packages is needed:"
 msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
 
-#: ../rpmdrake:639
-#, c-format
+#: ../rpmdrake:672
+msgid "Please choose"
+msgstr "Tchoezixhoz s' i vs plait"
+
+#: ../rpmdrake:695
 msgid "Please wait, listing packages..."
 msgstr "Tårdjîz on pô s' i vs plait, dji fwait l' djivêye des pacaedjes..."
 
-#: ../rpmdrake:657
-#, c-format
+#: ../rpmdrake:713
 msgid "No update"
 msgstr "Nou metaedjes a djoû"
 
-#: ../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 ""
 "a nén di metaedjes a djoû po les pacaedjes astalés so vosse copiutrece, "
 "soeye-t i ki vos les avoz ddja astalés."
 
-#: ../rpmdrake:681
-#, c-format
+#: ../rpmdrake:737 ../rpmdrake:1003
 msgid "All"
 msgstr "Totafwait"
 
 #. -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 "Pus d' info"
 
-#: ../rpmdrake:735 ../rpmdrake:1708
-#, c-format
+#: ../rpmdrake:791 ../rpmdrake:1805
 msgid "Information on packages"
 msgstr "Informåcion so les pacaedjes"
 
-#: ../rpmdrake:757
-#, c-format
+#: ../rpmdrake:813
 msgid "Some additional packages need to be removed"
 msgstr "Kékès ôtes pacaedjes divèt esse oistés"
 
-#: ../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 ""
 "Cåze di leus aloyances, les pacaedjes ki shuvèt dvèt esse oistés eto:\n"
 "\n"
 
-#: ../rpmdrake:764 ../rpmdrake:773
-#, c-format
+#: ../rpmdrake:820 ../rpmdrake:829
 msgid "Some packages can't be removed"
 msgstr "Des pacaedjes k' i gn a n' polèt nén esse oistés"
 
-#: ../rpmdrake:765
-#, c-format
+#: ../rpmdrake:821
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1395,8 +1188,7 @@ msgstr ""
 "Dji rgrete, mins oister ces pacaedjes la va spiyî l' sistinme da vosse:\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"
@@ -1406,13 +1198,11 @@ msgstr ""
 "asteure:\n"
 "\n"
 
-#: ../rpmdrake:803
-#, c-format
+#: ../rpmdrake:859
 msgid "Additional packages needed"
 msgstr "Ôtes pacaedjes k' end a mezåjhe"
 
-#: ../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 ""
 "Po verifyî les aloyances, les pacaedjes ki shuvèt dvèt esse astalés eto:\n"
 "\n"
 
-#: ../rpmdrake:819
-#, c-format
+#: ../rpmdrake:875
+#, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (fwait pårteye del djivêye a passer houte)"
 
-#: ../rpmdrake:822
-#, c-format
+#: ../rpmdrake:878
 msgid "Some packages can't be installed"
 msgstr "Des pacaedjes k' i gn a n' polèt nén esse astalés"
 
-#: ../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 "Des pacaedjes k' i gn a dvèt esse dizastalés"
 
-#: ../rpmdrake:863
-#, c-format
+#: ../rpmdrake:919
+#, perl-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Tchoezi: %d Mo / Plaece libe sol deure plake: %d Mo"
 
-#: ../rpmdrake:864
-#, c-format
+#: ../rpmdrake:920
+#, perl-format
 msgid "Selected size: %d MB"
 msgstr "Grandeu tchoezeye: %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 "I n' a pont d' discrijhaedje po ç' pacaedje ci\n"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Security updates"
-msgstr "Metaedjes a djoû di såvrité"
-
-#: ../rpmdrake:939
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Metaedjes a djoû di coridjaedje"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Installed"
+msgstr "Astaler"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "Metaedjes a djoû normås"
+#: ../rpmdrake:1003
+#, fuzzy
+msgid "Non installed"
+msgstr "Astaler"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
+#, perl-format
 msgid "%s choices"
 msgstr "%s tchuzes"
 
-#: ../rpmdrake:960
-#, c-format
+#: ../rpmdrake:1004
 msgid "Mandriva Linux choices"
 msgstr "Tchuzes 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 "Tos les pacaedjes, relîs alfabeticmint"
 
-#: ../rpmdrake:971
-#, c-format
-msgid "All packages, by group"
-msgstr "Tos les pacaedjes, pa groupe"
+#: ../rpmdrake:1007
+msgid "All packages, by update availability"
+msgstr "To les pacaedjes, pa disponibilité di metaedjes a djoû"
 
-#: ../rpmdrake:972
-#, c-format
+#: ../rpmdrake:1008
 msgid "All packages, by size"
 msgstr "Tos les pacaedjes, pa grandeu"
 
-#: ../rpmdrake:973
-#, c-format
+#: ../rpmdrake:1009
 msgid "All packages, by selection state"
 msgstr "Tos les pacaedjes, pa l' estat di tchoezixhaedje"
 
-#: ../rpmdrake:977
-#, c-format
-msgid "All packages, by medium repository"
-msgstr "Tos les pacaedjes, pa sopoirt d' astalaedje"
-
-#: ../rpmdrake:978
-#, c-format
-msgid "All packages, by update availability"
-msgstr "To les pacaedjes, pa disponibilité di metaedjes a djoû"
-
-#: ../rpmdrake:982
-#, c-format
+#: ../rpmdrake:1010
 msgid "Leaves only, sorted by install date"
 msgstr "Rén k' les foyes, reléjhowes pal date d' astalaedje"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "Tos les pacaedjes, pa groupe"
+
+#: ../rpmdrake:1013
+#, fuzzy
+msgid "All updates"
+msgstr "Metaedjes a djoû normås"
+
+#: ../rpmdrake:1013
+msgid "Bugfixes updates"
+msgstr "Metaedjes a djoû di coridjaedje"
+
+#: ../rpmdrake:1013
+msgid "Normal updates"
+msgstr "Metaedjes a djoû normås"
+
+#: ../rpmdrake:1013
+msgid "Security updates"
+msgstr "Metaedjes a djoû di såvrité"
+
+#: ../rpmdrake:1068
 msgid "in names"
 msgstr "ezès nos d' pacaedje"
 
-#: ../rpmdrake:1059
-#, c-format
+#: ../rpmdrake:1070
 msgid "in descriptions"
 msgstr "ezès discrijhaedjes"
 
-#: ../rpmdrake:1061
-#, c-format
+#: ../rpmdrake:1072
 msgid "in file names"
 msgstr "ezès nos d' fitchîs"
 
-#: ../rpmdrake:1070
-#, c-format
-msgid "Normal information"
-msgstr "Informåcions normåles"
-
-#: ../rpmdrake:1070
-#, c-format
-msgid "Maximum information"
-msgstr "Li pus d' informåcions"
-
 #: ../rpmdrake:1098
-#, c-format
 msgid "You need to select some packages first."
 msgstr "Vos dvoz tchoezi sacwants pacaedjes d' aprume."
 
 #: ../rpmdrake:1103
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Pår trop di pacaedjes ont stî tchoezis"
 
 #: ../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"
@@ -1574,7 +1348,7 @@ msgstr ""
 "Voloz vs vormint astaler tos les pacaedjes tchoezis?"
 
 #: ../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"
 "C' est bon di continouwer?"
 
-#: ../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 "/_Fitchî"
 
-#: ../rpmdrake:1155
-#, c-format
+#: ../rpmdrake:1151
 msgid "/_Update media"
 msgstr "/_Mete a djoû les sopoirts"
 
-#: ../rpmdrake:1165
-#, c-format
+#: ../rpmdrake:1161
 msgid "/_Reset the selection"
 msgstr "/_Rifé l' tchuze"
 
-#: ../rpmdrake:1177
-#, c-format
+#: ../rpmdrake:1173
 msgid "/Reload the _packages list"
 msgstr "/Ritcherdjî li djivêye des _pacaedjes"
 
-#: ../rpmdrake:1183
-#, c-format
+#: ../rpmdrake:1179
 msgid "/_Quit"
 msgstr "/Moussî _foû"
 
-#: ../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 "/_Tchuzes"
 
-#: ../rpmdrake:1187 ../rpmdrake:1194
-#, c-format
+#: ../rpmdrake:1183 ../rpmdrake:1213
 msgid "/_Show automatically selected packages"
 msgstr "/Mostrer les pacaedjes tchoezis _otomaticmint"
 
-#: ../rpmdrake:1191 ../rpmdrake:1192
-#, c-format
+#: ../rpmdrake:1187 ../rpmdrake:1188 ../rpmdrake:1189 ../rpmdrake:1190
 msgid "/_Help"
 msgstr "/_Aidance"
 
-#: ../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 "Metaedjes a djoû di 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 "Trover:"
 
-#: ../rpmdrake:1217
-#, c-format
+#: ../rpmdrake:1237
 msgid "Search"
 msgstr "Cweri"
 
-#: ../rpmdrake:1219
-#, c-format
+#: ../rpmdrake:1239
 msgid "Clear"
 msgstr "Netyî"
 
-#: ../rpmdrake:1227
-#, c-format
-msgid "Install"
-msgstr "Astaler"
+#: ../rpmdrake:1247
+msgid "Apply"
+msgstr ""
 
-#: ../rpmdrake:1232
-#, c-format
+#: ../rpmdrake:1252
 msgid "Quit"
 msgstr "Cwiter"
 
-#: ../rpmdrake:1276
-#, c-format
+#: ../rpmdrake:1306
 msgid "Fatal error"
 msgstr "Aroke moirt"
 
-#: ../rpmdrake:1277
-#, c-format
+#: ../rpmdrake:1307
+#, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "I gn a-st avou èn aroke moirt: %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 +1469,12 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../rpmdrake:1295
-#, c-format
+#: ../rpmdrake:1323
 msgid "Already existing update media"
 msgstr "Sopoirts di metaedjes a djoû k' egzistèt ddja"
 
-#: ../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 +1490,12 @@ msgstr ""
 "\n"
 "Poy, renondez %s."
 
-#: ../rpmdrake:1306
-#, c-format
+#: ../rpmdrake:1334
 msgid "How to choose manually your mirror"
 msgstr "Kimint tchoezi manuwelmint vosse muroe"
 
-#: ../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,58 +1509,56 @@ msgstr ""
 "\n"
 "Poy, renondez %s."
 
-#: ../rpmdrake:1343
-#, c-format
+#: ../rpmdrake:1372
 msgid "Please wait, finding available packages..."
 msgstr "Tårdjîz on pô s' i vs plait, dji cwir après les pacaedjes k' i gn a..."
 
-#: ../rpmdrake:1434
-#, c-format
+#: ../rpmdrake:1373
+msgid "Please wait, reading packages database..."
+msgstr "Tårdjîz on pô s' i vs plait, dji lî li båze di dnêyes des pacaedjes..."
+
+#: ../rpmdrake:1528
+#, perl-format
 msgid "Inspecting %s"
 msgstr "Analijhant %s"
 
-#: ../rpmdrake:1457
-#, c-format
+#: ../rpmdrake:1551
 msgid "changes:"
 msgstr "candjmints:"
 
-#: ../rpmdrake:1465
-#, c-format
+#: ../rpmdrake:1559
+#, perl-format
 msgid "Remove .%s"
 msgstr "Oister li *.%s"
 
-#: ../rpmdrake:1469
-#, c-format
+#: ../rpmdrake:1563
+#, perl-format
 msgid "Use .%s as main file"
 msgstr "Eployî li *.%s come mwaisse fitchî"
 
-#: ../rpmdrake:1473
-#, c-format
+#: ../rpmdrake:1567
 msgid "Do nothing"
 msgstr "Èn rén fé"
 
-#: ../rpmdrake:1489
-#, c-format
+#: ../rpmdrake:1583
 msgid "Installation finished"
 msgstr "L' astalaedje a fini"
 
-#: ../rpmdrake:1504
-#, c-format
+#: ../rpmdrake:1598
 msgid "Inspect..."
 msgstr "Analijhant..."
 
-#: ../rpmdrake:1537 ../rpmdrake:1705
-#, c-format
+#. N("Everything installed successfully"),
+#: ../rpmdrake:1631 ../rpmdrake:1802
 msgid "All requested packages were installed successfully."
 msgstr "Totes les pacaedjes dimandés ont stî astalés comifåt."
 
-#: ../rpmdrake:1541 ../rpmdrake:1685
-#, c-format
+#: ../rpmdrake:1635 ../rpmdrake:1782
 msgid "Problem during installation"
 msgstr "Åk n' a nén stî tins d' l' astalaedje"
 
-#: ../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"
@@ -1787,18 +1568,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1556
-#, c-format
+#: ../rpmdrake:1653
 msgid "Unable to get source packages."
 msgstr "Dji n' a nén savou prinde les pacaedjes sourdants."
 
-#: ../rpmdrake:1557
-#, c-format
+#: ../rpmdrake:1654
+#, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Dji m' escuze, mins dji n' sai prinde les pacaedjes sourdants. %s"
 
-#: ../rpmdrake:1558 ../rpmdrake:1632
-#, c-format
+#: ../rpmdrake:1655 ../rpmdrake:1729
+#, perl-format
 msgid ""
 "\n"
 "\n"
@@ -1810,38 +1590,34 @@ msgstr ""
 "Aroke(s) di rapoirté(s):\n"
 "%s"
 
-#: ../rpmdrake:1567
-#, c-format
-msgid "Package installation..."
-msgstr "Astalaedje do pacaedje..."
-
-#: ../rpmdrake:1567
-#, c-format
+#: ../rpmdrake:1664
 msgid "Initializing..."
 msgstr "Inicialijhaedje..."
 
-#: ../rpmdrake:1576
-#, c-format
+#: ../rpmdrake:1664
+msgid "Package installation..."
+msgstr "Astalaedje do pacaedje..."
+
+#: ../rpmdrake:1673
 msgid "Change medium"
 msgstr "Candjî di sopoirt"
 
-#: ../rpmdrake:1577
-#, c-format
+#: ../rpmdrake:1674
+#, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Metoz l' sopoirt lomé «%s» dins l' lijheu [%s]"
 
-#: ../rpmdrake:1584
-#, c-format
+#: ../rpmdrake:1681
+#, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Aberwetant l' pacaedje «%s» (%s/%s)..."
 
-#: ../rpmdrake:1607
-#, c-format
+#: ../rpmdrake:1704
 msgid "Verifying package signatures..."
 msgstr "Verifiaedje des sinateures des pacaedjes..."
 
-#: ../rpmdrake:1620
-#, c-format
+#: ../rpmdrake:1717
+#, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1855,13 +1631,12 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../rpmdrake:1629 ../rpmdrake:1745
-#, c-format
+#: ../rpmdrake:1726 ../rpmdrake:1842
 msgid "Installation failed"
 msgstr "L' astalaedje a fwait berwete"
 
-#: ../rpmdrake:1630
-#, c-format
+#: ../rpmdrake:1727
+#, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1873,23 +1648,21 @@ msgstr ""
 "\n"
 "Vos dvoz motoit mete a djoû vosse båze di dnêyes des sopoirts."
 
-#: ../rpmdrake:1645
-#, c-format
+#: ../rpmdrake:1742
 msgid "Preparing packages installation..."
 msgstr "Dj' aprestêye les pacaedjes po l' astalaedje..."
 
-#: ../rpmdrake:1648
-#, c-format
+#: ../rpmdrake:1745
+#, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
 
-#: ../rpmdrake:1664
-#, c-format
+#: ../rpmdrake:1761
+#, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "dji n' sai aveur accès å fitchî rpm [%s]"
 
-#: ../rpmdrake:1700
-#, c-format
+#: ../rpmdrake:1797
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1902,43 +1675,33 @@ msgstr ""
 "avou « .rpmnew » ou « .rpmsave » come cawete, vos les dvrîz\n"
 "rloukî po decider cwè fé avou zels:"
 
-#: ../rpmdrake:1710
-#, c-format
+#: ../rpmdrake:1807
 msgid "These packages come with upgrade information"
 msgstr "Ces pacaedjes vinèt avou des informåcions sol metaedje a djoû"
 
-#: ../rpmdrake:1722
-#, c-format
+#: ../rpmdrake:1819
+#, perl-format
 msgid "More information on package... [%s]"
 msgstr "Pus d' informåcions sol pacaedje... [%s]"
 
-#: ../rpmdrake:1735
-#, c-format
+#: ../rpmdrake:1832
 msgid "No package found for installation."
 msgstr "Nou pacaedje n' a stî trové po l' astalaedje."
 
-#: ../rpmdrake:1736
-#, c-format
+#: ../rpmdrake:1833
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Aroke moirt: nou pacaedje n' a stî trové po l' astalaedje."
 
-#: ../rpmdrake:1757
-#, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Tårdjîz on pô s' i vs plait, dji lî li båze di dnêyes des pacaedjes..."
-
-#: ../rpmdrake:1809
-#, c-format
+#: ../rpmdrake:1858
 msgid "Please wait, removing packages..."
 msgstr "Tårdjîz on pô s' i vs plait, rpm oistêye les pacaedjes..."
 
-#: ../rpmdrake:1820
-#, c-format
+#: ../rpmdrake:1869
 msgid "Problem during removal"
 msgstr "Åk n' a nén stî tins do oistaedje"
 
-#: ../rpmdrake:1821
-#, c-format
+#: ../rpmdrake:1870
+#, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1948,8 +1711,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1961,8 +1723,8 @@ msgstr ""
 "Ciste usteye chal vos aidrè a tchoezi kés programes ki vos vloz dizastaler "
 "di vosse copiutrece."
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1974,13 +1736,11 @@ msgstr ""
 "Ciste usteye chal vos aidrè a tchoezi les metaedjes a djoû ki vos vloz "
 "astaler sol copiutrece da vosse."
 
-#: ../rpmdrake:1866
-#, c-format
+#: ../rpmdrake:1915
 msgid "Welcome to the software installation tool!"
 msgstr "Bénvnowe a l' usteye d' astalaedje des programes!"
 
-#: ../rpmdrake:1867
-#, c-format
+#: ../rpmdrake:1916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1994,214 +1754,172 @@ msgstr ""
 "pacaedjes rpm so des plakes lazer. Ciste usteye chal vos aidrè a tchoezi kés "
 "programes vos vloz astaler sol copiutrece da vosse."
 
-#: ../rpmdrake.pm:101
-#, c-format
-msgid "Software Update"
-msgstr "Metaedje a djoû des programes"
-
-#: ../rpmdrake.pm:101
-#, c-format
+#: ../rpmdrake.pm:102
 msgid "Mandriva Linux Update"
 msgstr "Metaedjes a djoû di Mandriva Linux"
 
-#: ../rpmdrake.pm:128
-#, c-format
+#: ../rpmdrake.pm:102
+msgid "Software Update"
+msgstr "Metaedje a djoû des programes"
+
+#: ../rpmdrake.pm:129
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Dinez vos informåcions po-z aveur accès å procsi\n"
 
-#: ../rpmdrake.pm:129
-#, c-format
+#: ../rpmdrake.pm:130
 msgid "User name:"
 msgstr "No d' uzeu:"
 
-#: ../rpmdrake.pm:170
-#, c-format
+#: ../rpmdrake.pm:172
 msgid "Software Packages Removal"
 msgstr "Oistaedje des pacaedjes di programes"
 
-#: ../rpmdrake.pm:171
-#, c-format
+#: ../rpmdrake.pm:173
 msgid "Software Packages Update"
 msgstr "Metaedje a djoû des pacaedjes di programes"
 
-#: ../rpmdrake.pm:172
-#, c-format
+#: ../rpmdrake.pm:174
 msgid "Software Packages Installation"
 msgstr "Astalaedje des pacaedjes di programes"
 
-#: ../rpmdrake.pm:211
-#, c-format
+#: ../rpmdrake.pm:213
 msgid "No"
 msgstr "Neni"
 
-#: ../rpmdrake.pm:215
-#, c-format
+#: ../rpmdrake.pm:217
 msgid "Yes"
 msgstr "Oyi"
 
-#: ../rpmdrake.pm:263
-#, c-format
+#: ../rpmdrake.pm:265
 msgid "Info..."
 msgstr "Informåcions..."
 
-#: ../rpmdrake.pm:376
-#, c-format
+#: ../rpmdrake.pm:381
 msgid "Austria"
 msgstr "Otriche"
 
-#: ../rpmdrake.pm:377
-#, c-format
+#: ../rpmdrake.pm:382
 msgid "Australia"
 msgstr "Ostraleye"
 
-#: ../rpmdrake.pm:378
-#, c-format
+#: ../rpmdrake.pm:383
 msgid "Belgium"
 msgstr "Beldjike"
 
-#: ../rpmdrake.pm:379
-#, c-format
+#: ../rpmdrake.pm:384
 msgid "Brazil"
 msgstr "Braezi"
 
-#: ../rpmdrake.pm:380
-#, c-format
+#: ../rpmdrake.pm:385
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:381
-#, c-format
+#: ../rpmdrake.pm:386
 msgid "Switzerland"
 msgstr "Swisse"
 
-#: ../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 "Tchekeye"
 
-#: ../rpmdrake.pm:384
-#, c-format
+#: ../rpmdrake.pm:389
 msgid "Germany"
 msgstr "Almagne"
 
-#: ../rpmdrake.pm:385
-#, c-format
+#: ../rpmdrake.pm:390
 msgid "Danmark"
 msgstr "Daenmåtche"
 
-#: ../rpmdrake.pm:386 ../rpmdrake.pm:390
-#, c-format
+#: ../rpmdrake.pm:391 ../rpmdrake.pm:395
 msgid "Greece"
 msgstr "Grece"
 
-#: ../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 "Hongreye"
 
-#: ../rpmdrake.pm:392
-#, c-format
+#: ../rpmdrake.pm:397
 msgid "Israel"
 msgstr "Israyel"
 
-#: ../rpmdrake.pm:393
-#, c-format
+#: ../rpmdrake.pm:398
 msgid "Italy"
 msgstr "Itåleye"
 
-#: ../rpmdrake.pm:394
-#, c-format
+#: ../rpmdrake.pm:399
 msgid "Japan"
 msgstr "Djapon"
 
-#: ../rpmdrake.pm:395
-#, c-format
+#: ../rpmdrake.pm:400
 msgid "Korea"
 msgstr "Corêye"
 
-#: ../rpmdrake.pm:396
-#, c-format
+#: ../rpmdrake.pm:401
 msgid "Netherlands"
 msgstr "Olande"
 
-#: ../rpmdrake.pm:397
-#, c-format
+#: ../rpmdrake.pm:402
 msgid "Norway"
 msgstr "Norvedje"
 
-#: ../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 "Rûsseye"
 
-#: ../rpmdrake.pm:401
-#, c-format
+#: ../rpmdrake.pm:406
 msgid "Sweden"
 msgstr "Suwede"
 
-#: ../rpmdrake.pm:402
-#, c-format
+#: ../rpmdrake.pm:407
 msgid "Singapore"
 msgstr "Singapour"
 
-#: ../rpmdrake.pm:403
-#, c-format
+#: ../rpmdrake.pm:408
 msgid "Slovakia"
 msgstr "Eslovakeye"
 
-#: ../rpmdrake.pm:404
-#, c-format
+#: ../rpmdrake.pm:409
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:405
-#, c-format
+#: ../rpmdrake.pm:410
 msgid "United Kingdom"
 msgstr "Rweyôme-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 "Estats 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"
@@ -2213,8 +1931,7 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../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"
@@ -2227,25 +1944,28 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../rpmdrake.pm:515
-#, c-format
+#: ../rpmdrake.pm:527
+#, fuzzy
+msgid "Mirror choice"
+msgstr "%s tchuzes"
+
+#: ../rpmdrake.pm:530
 msgid "Please wait, downloading mirror addresses."
 msgstr "Tårdjîz on pô s' i vs plait, dj' aberwetêye les adresses des muroes."
 
-#: ../rpmdrake.pm:516
-#, c-format
+#: ../rpmdrake.pm:531
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Tårdjîz on pô s' i vs plait, dj' aberwetêye do waibe da Mandriva les "
 "adresses des muroes."
 
-#: ../rpmdrake.pm:522
-#, c-format
+#. - seems that value is bitten before being printed by next func..
+#: ../rpmdrake.pm:537
 msgid "Error during download"
 msgstr "Åk n' a nén stî tot-z aberwetant"
 
-#: ../rpmdrake.pm:524
-#, c-format
+#: ../rpmdrake.pm:539
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2259,8 +1979,8 @@ msgstr ""
 "Motoit ki l' rantoele, ou l' waibe, èn sont nén disponibes pol moumint.\n"
 "Rissayîz ene miete pus tård."
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2275,18 +1995,15 @@ msgstr ""
 "moumint.\n"
 "Rissayîz ene miete pus tård."
 
-#: ../rpmdrake.pm:538
-#, c-format
+#: ../rpmdrake.pm:554
 msgid "No mirror"
 msgstr "Nou muroe"
 
-#: ../rpmdrake.pm:540
-#, c-format
+#: ../rpmdrake.pm:556
 msgid "I can't find any suitable mirror."
 msgstr "Dji n' sai trover nou muroe."
 
-#: ../rpmdrake.pm:541
-#, c-format
+#: ../rpmdrake.pm:557
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2300,71 +2017,66 @@ msgstr ""
 "l' årtchitecteure di vosse processeu n' est nén sopoirtêye påzès metaedjes a "
 "djoû oficirs di Mandriva Linux."
 
-#: ../rpmdrake.pm:560
-#, c-format
+#: ../rpmdrake.pm:576
 msgid "Please choose the desired mirror."
 msgstr "Tchoezixhoz li muroe ki vos vloz, s' i vs plait."
 
-#: ../rpmdrake.pm:618
-#, c-format
+#: ../rpmdrake.pm:634
+#, perl-format
 msgid "Copying file for medium `%s'..."
 msgstr "Dji copeye li fitchî pol sopoirt «%s»..."
 
-#: ../rpmdrake.pm:621
-#, c-format
+#: ../rpmdrake.pm:637
+#, perl-format
 msgid "Examining file of medium `%s'..."
 msgstr "Dji corwaite li fitchî pol sopoirt «%s»..."
 
-#: ../rpmdrake.pm:624
-#, c-format
+#: ../rpmdrake.pm:640
+#, perl-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Dji corwaite li fitchî då lon pol sopoirt «%s»..."
 
-#: ../rpmdrake.pm:628
-#, c-format
+#: ../rpmdrake.pm:644
 msgid " done."
 msgstr " fwait."
 
-#: ../rpmdrake.pm:632
-#, c-format
+#: ../rpmdrake.pm:648
 msgid " failed!"
 msgstr " a fwait berwete!"
 
 #. -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 do sopoirt %s"
 
-#: ../rpmdrake.pm:640
-#, c-format
+#: ../rpmdrake.pm:656
+#, perl-format
 msgid "Starting download of `%s'..."
 msgstr "Dj' atake l' aberwetaedje di «%s»..."
 
-#: ../rpmdrake.pm:644
-#, c-format
+#: ../rpmdrake.pm:660
+#, perl-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 "Aberwetaedje di «%s»,\n"
 "tins ki dmeure:%s, roedeu:%s"
 
-#: ../rpmdrake.pm:647
-#, c-format
+#: ../rpmdrake.pm:663
+#, perl-format
 msgid "Download of `%s', speed:%s"
 msgstr "Aberwetaedje di «%s», roedeu:%s"
 
-#: ../rpmdrake.pm:658
-#, c-format
+#: ../rpmdrake.pm:674
 msgid "Please wait, updating media..."
 msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
 
-#: ../rpmdrake.pm:685
-#, c-format
+#: ../rpmdrake.pm:701
 msgid "Error retrieving packages"
 msgstr "Åk n' a nén stî tot prindant les pacaedjes"
 
-#: ../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"
@@ -2379,36 +2091,31 @@ msgstr ""
 "po l' poleur rapontyî a môde di djin; ou bén li sopoirt èn pout nén esse "
 "adjondou pol moumint, vos dvrîz adon rsayî pus tård."
 
-#: ../rpmdrake.pm:717
-#, c-format
+#: ../rpmdrake.pm:733
 msgid "Update media"
 msgstr "Mete a djoû les sopoirts"
 
-#: ../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 ""
 "Nou sopoirt actif di trové. Vos dvoz mete onk en alaedje pol poleur mete a "
 "djoû."
 
-#: ../rpmdrake.pm:729
-#, c-format
+#: ../rpmdrake.pm:745
 msgid "Select the media you wish to update:"
 msgstr "Tchoezixhoz les sopoirt(s) ki vos vloz mete a djoû:"
 
-#: ../rpmdrake.pm:743
-#, c-format
+#: ../rpmdrake.pm:759
 msgid "Select all"
 msgstr "Tchoezi ttafwait"
 
-#: ../rpmdrake.pm:747
-#, c-format
+#: ../rpmdrake.pm:763
 msgid "Update"
 msgstr "Mete a djoû"
 
-#: ../rpmdrake.pm:768
-#, c-format
+#: ../rpmdrake.pm:784
+#, perl-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2420,8 +2127,8 @@ msgstr ""
 "Arokes:\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 +2138,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:814
-#, c-format
+#: ../rpmdrake.pm:830
 msgid "Unable to create medium."
 msgstr "Dji n' sai askepyî l' sopoirt."
 
-#: ../rpmdrake.pm:819
-#, c-format
+#: ../rpmdrake.pm:835
 msgid "Failure when adding medium"
 msgstr "Åk n' a nén stî tot radjoutant l' sopoirt"
 
-#: ../rpmdrake.pm:820
-#, c-format
+#: ../rpmdrake.pm:836
+#, perl-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2452,8 +2157,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 +2168,8 @@ msgstr ""
 "modêye di %s en alaedje pol moumint (%s).\n"
 "Ci sopoirt la serè dismetou."
 
-#: ../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 +2179,11 @@ msgstr ""
 "modêye di Mandriva Linux en alaedje pol moumint (%s).\n"
 "Ci sopoirt la serè dismetou."
 
-#: ../rpmdrake.pm:852
-#, c-format
+#: ../rpmdrake.pm:869
 msgid "Help launched in background"
 msgstr "Aidance enondêye come bouye di fond"
 
-#: ../rpmdrake.pm:853
-#, c-format
+#: ../rpmdrake.pm:870
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2756,6 +2459,18 @@ msgstr "Oister des programes"
 msgid "Software Media Manager"
 msgstr "Manaedjeu des sopoirts d' astalaedje"
 
+#~ msgid "Stop"
+#~ msgstr "Arester"
+
+#~ msgid "All packages, by medium repository"
+#~ msgstr "Tos les pacaedjes, pa sopoirt d' astalaedje"
+
+#~ msgid "Normal information"
+#~ msgstr "Informåcions normåles"
+
+#~ msgid "Maximum information"
+#~ msgstr "Li pus d' informåcions"
+
 #~ msgid "everything was installed correctly"
 #~ msgstr "totafwait a stî astalé comifåt"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd247ca6..b956ba7d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,21 +11,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2006-01-26 13:16+0100\n"
-"PO-Revision-Date: 2005-12-17 19:57+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-22 16:36+0800\n"
+"PO-Revision-Date: 2006-07-22 16:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrakelinux.org>\n"
 "MIME-Version: 1.0\n"
 "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"
@@ -45,18 +44,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"
@@ -73,116 +70,94 @@ 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 "综合文件/hdlist 的相对路径:"
 
-#: ../edit-urpm-sources.pl:187
-#, c-format
+#: ../edit-urpm-sources.pl:190
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "如果留空, 将会自动探测综合文件/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?"
 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 "介质类型:"
 
@@ -190,10 +165,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,267 +176,223 @@ 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 "正在删除介质，请稍候..."
 
 #: ../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]>):"
 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)"
@@ -471,37 +401,31 @@ msgstr ""
 "(密钥名称: %3$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"
@@ -511,38 +435,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"
@@ -552,8 +470,7 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -566,8 +483,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"
@@ -577,13 +493,22 @@ 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 ""
+"您即将添加新的软件包介质 %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"
@@ -592,90 +517,81 @@ msgstr ""
 "您即将添加新的软件包介质“%s”。\n"
 "这意味着您可以从新介质中向系统添加新的软件包。"
 
-#: ../gurpmi.addmedia:87
-#, c-format
+#: ../gurpmi.addmedia:129
+#, 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=介质1,..       限制使用指定的介质"
 
-#: ../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=模式            设定模式(安装(默认)、删除、更新)"
 
-#: ../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"
 msgstr ""
 "  --parallel=别名,主机   在并行模式中使用[别名]组和[主机]来显示所需的依赖关系"
 
-#: ../rpmdrake:44
-#, c-format
+#: ../rpmdrake:47
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=包1,..     只显示这些软件包"
 
-#: ../rpmdrake:45
-#, c-format
+#: ../rpmdrake:48
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=包1,..       预先选择这些软件包"
 
-#: ../rpmdrake:46
-#, c-format
+#: ../rpmdrake:49
 msgid "  --root                 force to run as root"
 msgstr "  --root                 强制以 root 身份运行"
 
-#: ../rpmdrake:47
-#, c-format
+#: ../rpmdrake:50
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=包            搜索“包”"
 
-#: ../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"
@@ -685,634 +601,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 "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 "查询服务"
 
-#: ../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 "PHP"
+
+#: ../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 "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 "Shell"
 
-#: ../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 "TrueType"
 
-#: ../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"
@@ -1321,29 +1120,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"
@@ -1352,13 +1146,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"
@@ -1366,8 +1158,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"
@@ -1376,13 +1167,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"
@@ -1391,18 +1180,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"
@@ -1412,123 +1200,105 @@ 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
+msgid "Installed"
+msgstr "已安装"
 
-#: ../rpmdrake:939
-#, c-format
-msgid "Normal updates"
-msgstr "正常更新"
+#: ../rpmdrake:1003
+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 "不分类，按安装日期排列"
 
-#: ../rpmdrake:1057
-#, c-format
+#: ../rpmdrake:1011
+msgid "All packages, by group"
+msgstr "全部软件包，按组别排列"
+
+#: ../rpmdrake:1013
+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"
@@ -1543,7 +1313,7 @@ msgstr ""
 "您真的想要安装所有选中的软件包吗?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1557,89 +1327,99 @@ 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 "/报告错误(_R)"
+
+#: ../rpmdrake:1190
+msgid "/_About..."
+msgstr "/关于(_A)..."
+
+#: ../rpmdrake:1195
+#, perl-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr "版权 (C) %s Mandriva"
+
+#: ../rpmdrake:1197
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
+
+#: ../rpmdrake:1199
+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 "Funda Wang <fundawang@gmail.com>"
+
+#: ../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"
@@ -1651,13 +1431,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"
@@ -1672,13 +1451,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"
@@ -1691,58 +1469,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"
@@ -1752,18 +1528,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"
@@ -1775,38 +1550,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"
@@ -1820,13 +1591,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"
@@ -1838,23 +1608,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"
@@ -1866,43 +1634,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"
@@ -1912,8 +1670,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1924,8 +1681,8 @@ msgstr ""
 "\n"
 "本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1936,13 +1693,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"
@@ -1955,214 +1710,172 @@ msgstr ""
 "您的 Mandriva Linux 的安装光盘包含有数千个软件包。\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"
@@ -2174,8 +1887,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"
@@ -2187,23 +1899,25 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../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 "正在从 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"
@@ -2217,8 +1931,8 @@ msgstr ""
 "您的网络或网站可能不可用。\n"
 "请稍后再试。"
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2232,18 +1946,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"
@@ -2255,69 +1966,64 @@ msgstr ""
 "此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandriva Linux\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 "介质 %2$s 中的 %1$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"
@@ -2330,34 +2036,29 @@ 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"
@@ -2369,8 +2070,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"
@@ -2380,18 +2081,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"
@@ -2401,8 +2100,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"
@@ -2411,8 +2110,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"
@@ -2421,13 +2120,11 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 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 "已经启动帮助窗口，稍后桌面上将会出现。"
@@ -2702,17 +2399,3 @@ msgstr "删除软件"
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
 
-#~ msgid "everything was installed correctly"
-#~ msgstr "所有软件包都已正确安装"
-
-#~ msgid "Update medium"
-#~ msgstr "更新介质"
-
-#~ msgid "Regenerate hdlist"
-#~ msgstr "重新生成 hdlist"
-
-#~ msgid "Please wait, generating hdlist..."
-#~ msgstr "正在生成 hdlist，请稍候..."
-
-#~ msgid "Everything installed successfully"
-#~ msgstr "所有软件包都已成功安装"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index af118ae6..e5a395c0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17,7 +17,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-06 13:24+0800\n"
 "Last-Translator: Shvia Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -28,13 +29,11 @@ msgstr ""
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\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"
@@ -53,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"
@@ -81,104 +78,84 @@ 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
-#, 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?"
@@ -186,13 +163,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 +175,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,101 +186,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 "驗證要安裝的 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 "全域代理伺服器設定"
 
 #: ../edit-urpm-sources.pl:468
-#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -315,166 +274,137 @@ msgstr ""
 "[:port]> 例如 proxy.hinet.net:80)："
 
 #: ../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)"
@@ -483,37 +413,31 @@ msgstr ""
 "(鑰匙名稱： %3$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"
@@ -523,38 +447,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"
@@ -564,8 +482,7 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../edit-urpm-sources.pl:1010
-#, c-format
+#: ../edit-urpm-sources.pl:1024
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -578,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"
@@ -589,13 +505,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"
@@ -604,57 +529,54 @@ 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            設定模式 (install (預設值)、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"
@@ -662,33 +584,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                 強制使用 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"
@@ -698,634 +614,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 "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 "查詢服務"
 
-#: ../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 "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 "Shells"
 
-#: ../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 "檔案 (_F)：\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"
@@ -1334,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"
@@ -1365,13 +1159,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"
@@ -1379,8 +1171,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"
@@ -1389,13 +1180,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"
@@ -1404,18 +1193,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"
@@ -1425,123 +1213,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 "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 "不分類，僅依安裝時間排序"
 
-#: ../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"
@@ -1557,7 +1330,7 @@ msgstr ""
 "您確定要安裝全部選取的套件嗎?"
 
 #: ../rpmdrake:1117
-#, c-format
+#, perl-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "\n"
@@ -1571,89 +1344,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 "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"
@@ -1665,13 +1449,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"
@@ -1685,13 +1468,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"
@@ -1704,58 +1486,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"
@@ -1765,18 +1545,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"
@@ -1788,38 +1567,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"
@@ -1833,13 +1608,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"
@@ -1851,23 +1625,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"
@@ -1879,43 +1651,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"
@@ -1925,8 +1687,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1856
-#, c-format
+#: ../rpmdrake:1905
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1937,8 +1698,8 @@ msgstr ""
 "\n"
 "此工具將協助您選取要從系統移除的軟體。"
 
-#: ../rpmdrake:1861
-#, c-format
+#: ../rpmdrake:1910
+#, perl-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1949,13 +1710,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 +1728,172 @@ msgstr ""
 "套件都位於 CD 或 DVD 光碟內。此工具將會協助您選取您想\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"
@@ -2188,8 +1905,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 +1917,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 "請稍候，正在由 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"
@@ -2231,8 +1950,8 @@ msgstr ""
 "也許是網路連線失敗，或者是 Mandriva 站台暫時無法聯繫上，\n"
 "請稍候再試。"
 
-#: ../rpmdrake.pm:529
-#, c-format
+#: ../rpmdrake.pm:544
+#, perl-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2246,18 +1965,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"
@@ -2270,69 +1986,64 @@ msgstr ""
 "會發生這個問題的情況相當多，最常發生的是Mandriva Linux 官方更新目前\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 "媒體 %2$s 中的 %1$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"
@@ -2345,34 +2056,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"
@@ -2384,8 +2090,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"
@@ -2395,18 +2101,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"
@@ -2416,8 +2120,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"
@@ -2426,8 +2130,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"
@@ -2436,13 +2140,11 @@ msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 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 "說明視窗已經啟動，它將馬上出現於您的桌面。"
@@ -2717,6 +2419,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 "所有項目都已經正確的安裝了"