From e532550e763babb2564966fea8401af9d848da16 Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Fri, 19 Jan 2007 14:30:48 +0000
Subject: adapted to plural-form

---
 po/af.po       | 1755 +++++++++++++++++++++++++++++++++++------------------
 po/ar.po       | 1803 +++++++++++++++++++++++++++++++++++-------------------
 po/az.po       | 1770 ++++++++++++++++++++++++++++++++++-------------------
 po/bg.po       | 1771 ++++++++++++++++++++++++++++++++++-------------------
 po/bn.po       | 1771 ++++++++++++++++++++++++++++++++++-------------------
 po/bs.po       | 1749 +++++++++++++++++++++++++++++++++++------------------
 po/ca.po       | 1382 +++++++++++++++++++++++++++---------------
 po/cy.po       |    1 +
 po/da.po       | 1734 ++++++++++++++++++++++++++++++++++------------------
 po/de.po       |    1 +
 po/el.po       | 1398 ++++++++++++++++++++++++++----------------
 po/et.po       | 1315 ++++++++++++++++++++++++++--------------
 po/eu.po       | 1374 +++++++++++++++++++++++++++---------------
 po/fa.po       | 1758 ++++++++++++++++++++++++++++++++++-------------------
 po/fi.po       | 1749 +++++++++++++++++++++++++++++++++++------------------
 po/he.po       | 1760 ++++++++++++++++++++++++++++++++++-------------------
 po/hi.po       | 1753 ++++++++++++++++++++++++++++++++++-------------------
 po/hy.po       | 1707 ++++++++++++++++++++++++++++++++++------------------
 po/id.po       | 1314 ++++++++++++++++++++++++++--------------
 po/it.po       | 1734 ++++++++++++++++++++++++++++++++++------------------
 po/ka.po       | 1716 ++++++++++++++++++++++++++++++++++------------------
 po/ko.po       | 1797 ++++++++++++++++++++++++++++++++++--------------------
 po/lt.po       | 1460 +++++++++++++++++++++++++++-----------------
 po/lv.po       | 1838 +++++++++++++++++++++++++++++++++++---------------------
 po/mk.po       | 1734 ++++++++++++++++++++++++++++++++++------------------
 po/mn.po       | 1729 +++++++++++++++++++++++++++++++++-------------------
 po/nb.po       | 1734 ++++++++++++++++++++++++++++++++++------------------
 po/pa_IN.po    | 1764 ++++++++++++++++++++++++++++++++++-------------------
 po/pl.po       | 1749 +++++++++++++++++++++++++++++++++++------------------
 po/ro.po       | 1794 +++++++++++++++++++++++++++++++++++-------------------
 po/sq.po       | 1785 +++++++++++++++++++++++++++++++++++-------------------
 po/sr.po       | 1798 +++++++++++++++++++++++++++++++++++-------------------
 po/sr.pom      |    1 +
 po/sr@Latn.po  | 1813 +++++++++++++++++++++++++++++++++++--------------------
 po/sr@Latn.pom |    1 +
 po/sv.po       | 1739 +++++++++++++++++++++++++++++++++++------------------
 po/ta.po       | 1807 +++++++++++++++++++++++++++++++++++--------------------
 po/th.po       | 1800 ++++++++++++++++++++++++++++++++++--------------------
 po/tr.po       | 1769 ++++++++++++++++++++++++++++++++++-------------------
 po/uk.po       | 1369 ++++++++++++++++++++++++++---------------
 po/vi.po       | 1365 ++++++++++++++++++++++++++---------------
 po/wa.po       | 1756 ++++++++++++++++++++++++++++++++++-------------------
 po/zh_CN.po    | 1721 ++++++++++++++++++++++++++++++++++------------------
 po/zh_TW.po    | 1729 ++++++++++++++++++++++++++++++++++------------------
 44 files changed, 43833 insertions(+), 23534 deletions(-)

(limited to 'po')

diff --git a/po/af.po b/po/af.po
index d614c176..a1201ba5 100644
--- a/po/af.po
+++ b/po/af.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-af\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +20,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -39,16 +42,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -59,86 +64,106 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Voeg media by"
 
 #
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Plaaslike lêers"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Pad:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP bediener"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP bediener"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Pad of hegpunt:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Verwyderbare media"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Pad of hegpunt:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Soek..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Inteken:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relatiewe pad na die synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -146,110 +171,133 @@ msgstr ""
 "Daar is alreeds 'n media met daardie naam, wil \n"
 "u dit inderdaad vervang?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Voeg 'n media by:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Tipes media:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
 #
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Net 'n oomblik, verwyder media..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Redigeer 'n media"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Redigeer media \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Stoor veranderinge"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Instaanbediener..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, 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:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Konfigureer instaanbedieners"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -257,141 +305,175 @@ msgstr ""
 "Indien u 'n instaanbediener gebruik, voorsien die naam en opsionelepoort "
 "( sintaks: <instaanbediener[:poort]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Instaanbediener se naam:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Gebruiker:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Voeg 'n parallelle groep by"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Redigeer 'n parallelle groep"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Voeg 'n media limiet by"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Voeg rekenaar by"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redigeer parallelle groep \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Groepnaam"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Media limiet:"
 
 #
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Voeg by"
 
 #
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Verwyder"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Rekenaars:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Stel parallelle urpmi op (verspreide uitvoer van urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Groep"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Media limiet"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Media limiet"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Opdrag"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Redigeer..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Voeg by..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Beheer sleutels vir die digitale stempels van pakkette"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Media"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Voeg sleutel by"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:834
+#, c-format
+msgid "Close"
+msgstr "Sluit af"
+
 #
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Verwyder 'n sleutel"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -399,65 +481,77 @@ msgstr ""
 "Wil u werklik die sleutel %s vanaf media %s verwyder?\n"
 "(sleutelnaam: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Voeg sleutel by..."
 
 #
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Verwyder sleutel"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Konfigureer media"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Aktiveer?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Opgradeer..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Sleutelbeheer..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Parallel..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Hulp"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -467,7 +561,8 @@ msgstr ""
 "\n"
 "Kan ons voortgaan?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -481,7 +576,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -489,100 +585,115 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Gebruik: %s [OPSIES]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Loop in gebruikermodus"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -592,549 +703,789 @@ msgstr ""
 "Alhoewel u steeds in die bestaande databasis kan rondblaai\n"
 " sal u nie instaat wees om veranderinge te maak nie."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Toeganklikheid"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Data Wegbêre"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Rugsteun"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Skryf van CDs"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Saampers"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Ander"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Boeke"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Rekenaarboeke"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Neulvrae"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Vertel my"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Letterkunde"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Kommunikasie"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Databasisse"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Ontwikkeling"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME en GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE en Qt"
 
 #
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Redigeerders"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Opvoeding"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Nastrewers"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Nutsprogramme vir lêers"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Speletjies"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Avontuur"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Bordspel"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kaarte"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Legkaarte"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategie"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Grafiese gebruikskoppelvlak"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM gebaseer"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Monitor"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "multimedia"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Netwerk"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Klets"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Lêeroordrag"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Kitsboodskappe"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "e-Pos"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Nuus"
 
 #
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Eksterne toegang"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Kantoor"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publisering"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Wetenskappe"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Sterrekunde"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Chemie"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Rekenaarswetenskap"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geowetenskap"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Wiskunde"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fisika"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Aantekentolke"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Klank"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Rekenaar"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Basis"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Konfigurasie"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Selflaai en Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Hardeware"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Verpakking"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Drukkers"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr ""
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr ""
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Lettertipes"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Instruksielyn"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "Egte Tipe"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Tipe1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internasionalisering"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel en hardeware"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Programmateke"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Bedieners"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminale"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Teksverwante Nutsprogramme "
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Speelgoeters"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Werkstasie"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Konsole Hulpprogramme"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentasie"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Speletjiesrekenaar"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Internetstasie"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimediastasie"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Netwerkrekenaar (kliënt)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Kantoorwerkstasie"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Wetenskaplike Werkstasie"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Grafiese Omgewing"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME-werkstasie"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "'n Werkstasie"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE Werkstasie"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Ander Grafiese Werkskerms"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Bediener"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Databasis"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Vuurmuur/Netwerkroteerder"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Netwerkrekenaar-bediener"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Onbeskikbaar)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Soekverslag"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Soekverslag (none)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Net 'n oomblik, besig met soektog...."
 
-#
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Byvoegbaar"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Sagteware Beheer"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Staak"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Opgradeerbaar"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Nie gekies nie"
+#
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Byvoegbaar"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Gekose"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Nie gekies nie"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Belangrikhied: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Rede om op te dateer:"
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr ""
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr ""
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Lêers:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Veranderingestaaflêer:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Lêers:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Veranderingestaaflêer:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Media: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Tans geïnstalleer: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Weergawe: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Grootte: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Opsomming: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Beskrywing: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Sagteware Beheer"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Meer inligting rakende pakket..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Een van die volgende pakkette word benodig:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Kies asseblief"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Een van die volgende pakkette word benodig:"
+msgstr[1] "Een van die volgende pakkette word benodig:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Net 'n oomblik, skep 'n lys van pakkette"
 
 #
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Geen opdatering"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1144,35 +1495,42 @@ msgstr ""
 "opgradering pakkette beskikbaar vir die tans op u rekenaar\n"
 "óf u het alreeds hulle almal geïnstalleer."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Alles"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Meer inligting"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Inligting rakende pakkette"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Addisionele pakkette moet ook verwyder word"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr ""
 "Om alle afhanklikhede te bevredig, moet hierdie pakket(te) verwyder word:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Sommige pakkette kan nie verwyder word nie"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1180,7 +1538,8 @@ msgstr ""
 "Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1190,11 +1549,13 @@ msgstr ""
 "nie gekies word nie:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Addisionele pakkette word benodig"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1204,130 +1565,165 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Sommige pakkette kan nie geïnstalleer word nie"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Sommige pakkette kan nie geïnstalleer word nie"
+msgstr[1] "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Jammer, jy kan nie die volgende paket(te) kies nie:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Jammer, jy kan nie die volgende paket(te) kies nie:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Somige pakette sal moet verwyder word"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Gekies: %s / Oop skyfspasie: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Gekose pakkette: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "'n Ernstige fout het voorgekom: %s."
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Geïnstalleer"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr ""
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux keuses"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle pakette, alfabeties"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Alle pakkette, volgens beskikbare opgraderings"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Alle pakkette, volgens grootte"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Alle pakette, volgens wie gekies is"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Slegs eindpunte, gesorteer volgens installasiedatums"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Alle pakkette, volgens groep"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr ""
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Sekuriteitsopgraderings"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Foutkorreksiegraderings"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Normale opdaterings"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Sekuriteitsopgraderings"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "in name"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "in beskrywings"
 
 #
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "in lêername"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Kies eers u pakkette."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "U het te veel pakette gekies"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1342,130 +1738,172 @@ msgstr ""
 "heroorweeg word. \n"
 "Wil u voortgaan met die installasie?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Lêer"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr ""
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr ""
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Verlaat"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Opsies"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr ""
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Raporteer 'n Fout"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Aangaande..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
-msgstr ""
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Soek:"
 
 #
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Soek"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Maak skoon"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr ""
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Toepas"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Verlaat"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Ernstige fout"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "'n Ernstige fout het voorgekom: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Wag asb."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Installasievoorbereiding..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Aanvangstadium..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr ""
+msgstr "Konfigurasie"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1477,12 +1915,13 @@ msgstr ""
 "\n"
 "Kan ons voortgaan?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Reeds bestaande opdateringsmedia"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1497,12 +1936,13 @@ msgstr ""
 "\n"
 "Herbegin net %s daarna."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hoe om self u spieëlwebplek te kies"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1516,57 +1956,74 @@ msgstr ""
 "\n"
 "Herbegin net %s daarna."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "in beskrywings"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Net 'n oomblik, opsoek na beskikbare pakette..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Net 'n oomblik, lees die pakketdatabasis...."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Net 'n oomblik, skep 'n lys van pakkette"
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Net 'n oomblik, opsoek na beskikbare pakette..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Ondersoek %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "veranderinge:"
 
 #
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Verwyder .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Gebruik %s as die hooflêer"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Moet niks doen nie"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Geïnstalleer"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Beskou..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Al die gekose pakette het korrek geïnstalleer."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Daar was probleme tydens installasie"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1576,17 +2033,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Kan nie die bronpakette bekom nie."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Jammer, kan nie die bronpakette bekom nie. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1598,65 +2056,86 @@ msgstr ""
 "Fout(e) wat voorgekom het:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
+"geïnstalleer word:\n"
+"\n"
+msgstr[1] ""
+"Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
+"geïnstalleer word:\n"
+"\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Verwyder 'n sleutel"
+msgstr[1] "Verwyder 'n sleutel"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Kan ons voort gaan?"
+msgstr[1] ""
 "Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
 "\n"
 "%s\n"
 "\n"
 "Kan ons voort gaan?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Aanvangstadium..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Installasievoorbereiding..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Wag asb."
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Kan ons voortgaan?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Verander media"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laai tans pakket '%s' (%s/%s) af ..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Bevestig pakket stempels...."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1670,12 +2149,13 @@ msgstr ""
 "\n"
 "Wil u hulle steeds installeer?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "onsuksesvolle installasie"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1687,25 +2167,28 @@ msgstr ""
 "\n"
 "Probeer u media se databasis opdateer."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Installasievoorbereiding..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installeer pakket '%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, fuzzy, perl-format
+#: ../rpmdrake:2031
+#, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1713,34 +2196,49 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Standaard inligting"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
-msgstr ""
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Meer inligting rakende pakket..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
+msgstr "Meer inligting rakende pakket..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Fout"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Ernstige fout: kon nie die pakket wat ons moet installeer vind nie, jammer."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Net 'n oomblik, verwyder sagteware..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Daar was probleme tydens die verwydering"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1750,11 +2248,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Welkom"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1766,8 +2266,8 @@ msgstr ""
 "Hierdie nutsprogram sal u help om die programme\n"
 "te kies wat u wil verwyder."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1779,11 +2279,13 @@ msgstr ""
 "Hiedie nutsprogram sal u help om die pakkette te kies\n"
 "wat u wil opgradeer."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1797,172 +2299,213 @@ msgstr ""
 "beskikking op CDROM of DVD. Hierdie nutsprogram kan u help met\n"
 "die keuses asook die installasie daarvan."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Opdaterings"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr ""
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Opdaterings"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Gebruiker naam:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Verwyder Sagteware"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr ""
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Sagteware Installering"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Nee"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Inligting..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Australië"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australië"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "België"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasilië"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Switserland"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Tsjeggiese Republiek"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Duitsland"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Denemarke"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Griekeland"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Spanje"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Frankryk"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Hongarye"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italië"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norweë"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Pole"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Swede"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapoer"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakye"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Verenigde Koninkryk"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Verenigde State"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1970,7 +2513,8 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1982,25 +2526,28 @@ msgstr ""
 "\n"
 "Kan ons voortgaan?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Net 'n oomblik, laai die spieëlplekke se adresse van Mandriva af."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Probleme gedurende die aflaai"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2010,7 +2557,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2025,14 +2572,17 @@ msgstr ""
 "Probeer asseblief weer later."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Geen spieëlwebplekke"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2047,64 +2597,69 @@ msgstr ""
 "'Mandriva Linux Official Updates' nie."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Kies asseblief 'n spieëlwebplek."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Ondersoek medialêer '%s'....."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ondersoek die afgeleë medialêer '%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr "voltooi."
 
 #
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " gefaal!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s from media %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Begin die aflaai van '%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Aflaai van '%s',tyd gelede:%s, spoed: %s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Aflaai van '%s', spoed: %s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Net 'n oomblik, media word vervris..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2114,29 +2669,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Dateer media op"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Kies die media wat u wil opdateer:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr ""
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Opgradeer"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2148,52 +2703,56 @@ msgstr ""
 "Foute:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Probleme met skep van media."
 
 #
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Die hulpprogram is afgeskop in die agtergrond"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2469,21 +3028,18 @@ msgstr "Verwyder Sagteware"
 msgid "Software Media Manager"
 msgstr "Software Media Manager"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Net 'n oomblik, lees die pakketdatabasis...."
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Geen pakket kon vir die installasie gevind word nie."
 
-#~ 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"
 
@@ -2508,9 +3064,6 @@ msgstr "Software Media Manager"
 #~ msgid "Keys"
 #~ msgstr "Sleutels"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "Choose a mirror..."
 #~ msgstr "Kies 'n spieëlwebplek..."
 
diff --git a/po/ar.po b/po/ar.po
index 85641eb5..7a351c0f 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "اختيار نوع الوسط"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -42,16 +45,18 @@ msgstr ""
 "التحديثات الرسميّة لتوزيعتك. (يمكنك إضافة كلتاها، ولكن سيتوجب عليك\n"
 "عمل ذلك بخطوتين)."
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "مصادر التوزيعة"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "تحديثات رسميّة"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -69,194 +74,235 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "انتظر من فضلك، جاري إضافة الوسائط..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "أضف وسيط"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "ملفات محلية"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "المسار:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "خادم FTP"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "العنوان:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "خادم FTP"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "خادم HTTP"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "المسار أو نقطة التحميل:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "الأجهزة القابلة للإزالة"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "المسار أو نقطة التحميل:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "استعرض..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "اسم الدخول:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "المسار الى ملف التخليق أو hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "اذا تم تركه فارغاً سيتم البحث عن synthesis/hdlist تلقائياً"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "الإسم:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "إنشاء وسط لتوزيعة كاملة"
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "اختر الوسائط التي تريد تحديثها:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr "هناك وسيط بهذا الإسم مسبقاً، هل تريد استبداله فعلاً؟"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "جاري اضافة وسيط"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "نوع الوسط:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "الغاء"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "موافق"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "الخيارات العامّة لتثبيت الحزم"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "دائماً"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "بتاتاً"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "التحقق من الحزم المطلوب تثبيتها:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "برنامج التنزيل المطلوب استخدامه:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "إزالة المصدر"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "هل أنت متأكد أنك تريد إزالة المصدر \"%s\"؟"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "انتظر من فضلك، جاري اضافة الوسيط...."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "تحرير وسيط"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "جاري تحرير الوسيط \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "احفظ التغييرات"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "اعدادات البروكسي..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "تحتاج الى ادخال الوسيط للمتابعة"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "لكي يتم حفظ التغييرات، تحتاج الى ادخال الوسيط في السواقة."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "تهيئة البروكسي"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "إعدادات البروكسي للوسيط \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "إعدادات البروكسي الشّاملة"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -264,138 +310,172 @@ msgstr ""
 "اذا كنت تحتاج الى بروكسي، أدخل اسم المستضيف و المنفذ (على الشكل التالي: <اسم "
 "المستضيف[:المنفذ[>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "اسم مستضيف البروكسي"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "يجب عليك تحديد امس مستخدم/كلمة مرور للمصادقة في البروكسي:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "اسم المستخدم:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "أضف مجموعة موازية"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "حرر مجموعة متوازية"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "أضف حدود المصدر"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "اختر وسيط لإضافة حد الوسيط:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "أضف مستضيف"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "أدخل اسم المستضيف أو عنوان IP الخاص بالمستضيف المطلوب اضافته:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "جاري تحرير المجموعة الموازية \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "اسم المجموعة:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "البروتوكول:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "حد الوسيط:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "أضف"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "احذف"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "المستضيفات:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "قم بتهيئة urpmi المتوازي (تنفيذ موزع لـ urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "المجموعة"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "حد الوسائط"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "البروتوكول"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "حد الوسائط"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "الأمر"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(لا شئ)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "حرّر"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "أضف..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "قم بإدارة المفاتيح للتواقيع الرقمية الخاصة بالحزم"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "الوسيط"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "تعذر ايجاد اسم، المفتاح لا يوجد في تشفير rpm!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "أضف مفتاح"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "اختر مفتاح لإضافته الى الوسيط %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "إغلاق"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "احذف مفتاح"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -403,33 +483,38 @@ msgstr ""
 "هل أنت متأكد أنك تريد حذف المفتاح %s للوسيط %s?\n"
 "(اسم المفتاح: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "أضف مفتاح..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "احذف المفتاح"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "تهيئة الوسائط"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "متاح؟"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "حدّث"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -439,32 +524,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "إضافة مُخصص..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "حدّث..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "قم بإدارة المفاتيح..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "موازية..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "الخيارات العامّة..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "مساعدة"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -474,7 +565,8 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -488,7 +580,8 @@ msgstr ""
 "حاسوبك. عندها ستكون هذه المصادر موجودة لتثبيت حزم برمجية جديدة\n"
 "أو لعمل التحديثات."
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -499,12 +592,13 @@ msgstr ""
 "المستعملة لقاعدة بيانات الحزم (هل لديك مديروسائط آخر على سطح مكتب آخر، أو هل "
 "أنت تثبّت حزما حاليا كذلك ؟)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "تعذّرت إضافة الوسيط، وسائط خاطئة أو ناقصة"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -514,8 +608,8 @@ msgstr ""
 "هذا يعني أنّه سيكون باستطاعتك إضافة رزمات برامج جديدة\n"
 "إلى نظامك من هذا الوسيط الجديد."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -525,85 +619,96 @@ msgstr ""
 "هذا يعني أنّه سيكون باستطاعتك إضافة رزمات برامج جديدة\n"
 "إلى نظامك من هذا الوسيط الجديد."
 
-#: ../gurpmi.addmedia:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "تمّت إضافة الوسيط `%s' بنجاح."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "تمّت إضافة الوسيط `%s' بنجاح."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "الاستخدام: %s [خيارات]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
-#, fuzzy
+#: ../rpmdrake:45
+#, fuzzy, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - حدّث فقط وسائط التّحديث.\n"
 
-#: ../rpmdrake:45
-#, fuzzy
+#: ../rpmdrake:46
+#, fuzzy, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
-#, fuzzy
+#: ../rpmdrake:50
+#, fuzzy, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                      تقرير خدمة DrakBackup\n"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "جاري التشغيل في وضع المستخدم"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -613,547 +718,787 @@ msgstr ""
 "لن يكون باستطاعتك القيام بتعديلات على النظام،\n"
 "لكن لا يزال بإمكانك استعراض قاعدة البيانات الموجودة."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "تسهيلات المعاقين"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "أرشفة"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "النسخ الاحتياطي"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "نسخ الأقراص"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "الضغط"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "أخرى"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "كتب"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "كتب الكمبيوتر"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "أسئلة متكررة"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "مذكرات (كيف أعمل)"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "أدب"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "عنقود"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "تمرير الرّسائل"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "خدمات الاصطفاف"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "اتصالات"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "قواعد البيانات"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "التطوير"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME و GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "جافا"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE و Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "النواة"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "بيرل"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "بايثون"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "محررات النصوص"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "تعليم"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "المحاكيات"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "أدوات الملفات"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "ألعاب"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "مغامرات"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "ألعاب الأركيد"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "ألعاب لوحات"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "ألعاب ورقية"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "ألغاز"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "رياضة"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "استراتيجية"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "سطح المكتب الرسومي"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "مبنية على FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "كيدي"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "الرسوم"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "مراقبة النظام"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "الوسائط المتعدّدة"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "فيديو"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "الشبكات"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "محادثة"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "نقل الملفات"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "المراسلة الفورية"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "بريد"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "برامج الأخبار"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "الوصول البعيد"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "الويب"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "برامج المكتب"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "المفاتيح العامّة"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "النشر"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "علوم"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "علم الفلك"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "أحياء"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "كيمياء"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "علوم الحاسب"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "علوم الأرض"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "رياضيات"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "فيزياء"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "برامج سطر الأوامر"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "الصوت"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "النظام"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "الحزم الأساسية"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "التهيئة"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "الإقلاع و بدء التشغيل"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "العتاد"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "التحزيم"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "الطباعة"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "الانتشار"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "الانتشار"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "الخطوط"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "سطر الأوامر"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "التدويل"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "النواة و العتاد"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "المكتبات"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "الخادمات"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "محاكيات الطرفيات"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "أدوات النصوص"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "ألعاب طفولية"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "محطة عمل"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "أدوات الطرفيّات"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "التّوثيق"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "محطّة ألعاب"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "محطّة إنترنت"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "محطة وسائط متعدّدة"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "جهاز شبكة (عميل)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "محطّة عمل مكتبية"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "بيئات رسومية"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "محطّة عمل جينوم"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Plucker Desktop"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "محطّة عمل كيدي"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "أسطح مكتب رسومية أخرى"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "خادم"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "قواعد البيانات"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "جدار ناري/موجِّه"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "خادم شبكات"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "وب/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(غير موجود)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "نتائج البحث"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "نتائج البحث (لا شئ)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "انتظر من فضلك، جاري البحث..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "قابلة للإضافة"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "مدير وسائط البرمجيات"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "قف"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "قابلة للترقية"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "غير مختارة"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "قابلة للإضافة"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "مختار"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "غير مختارة"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "الأهمية: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "سبب التحديث:"
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "تحديثات أمنية"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "لا وصف"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "الملفات:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "سجل التغييرات:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "الملفات:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "سجل التغييرات:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "الوسيط: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "الإصدار المثبت حالياً: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "الإسم: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "الإصدار: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "الحجم: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "نبذة: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "وصف:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "مدير وسائط البرمجيات"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "معلومات أكثر حول الحزمة..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "أحد هذه الحزم مطلوب:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "فضلاً اختر"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "أحد هذه الحزم مطلوب:"
+msgstr[1] "أحد هذه الحزم مطلوب:"
+msgstr[2] "أحد هذه الحزم مطلوب:"
+msgstr[3] "أحد هذه الحزم مطلوب:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "انتظر من فضلك، جاري سرد الحزم..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "لا تحديث"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1163,34 +1508,41 @@ msgstr ""
 "لا توجد تحديثات للحزم الموجودة على جهازك،\n"
 "أو أنك قمت بتثبيت كل التحديثات مسبقا."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "الكلّ"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "مزيد من المعلومات"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "معلومات حول الحزم"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "هذه الحزم الاضافية يجب أن تحذف"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "نظرا للاعتمادات، فإن الحزمة/الحزم التالية يجب أن تحذف:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "بعض الحزم لا يمكن حذفها"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1198,7 +1550,8 @@ msgstr ""
 "ازالة هذه الحزم قد تكسر نظامك، عذراً:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1208,11 +1561,13 @@ msgstr ""
 "الرجوع عن اختيارها الآن:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "هناك حزم اضافية مطلوبة"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1222,132 +1577,174 @@ msgstr ""
 "التالية:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (تنتمي إلى القائمة الواجب تخطّيها)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "لا يمكن تثبيت بعض الحزم"
-
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "لا يمكن تثبيت بعض الحزم"
+msgstr[1] "لا يمكن تثبيت بعض الحزم"
+msgstr[2] "لا يمكن تثبيت بعض الحزم"
+msgstr[3] "لا يمكن تثبيت بعض الحزم"
+
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"عفواً، لا يمكن اختيار الحزمة/الحزم التالية:\n"
+"\n"
+"%s"
+msgstr[1] ""
+"عفواً، لا يمكن اختيار الحزمة/الحزم التالية:\n"
+"\n"
+"%s"
+msgstr[2] ""
+"عفواً، لا يمكن اختيار الحزمة/الحزم التالية:\n"
+"\n"
+"%s"
+msgstr[3] ""
 "عفواً، لا يمكن اختيار الحزمة/الحزم التالية:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "بعض الحزم يجب ازالتها"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "تم اختيار: %s / المساحة المتوفرة في القرص: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "الحجم المختار: %d ميغابايت"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "الوصف غير متوفّر لهذه الحزمة\n"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "ظهر خطأ قاتل: %s"
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "تثبيت"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "تثبيت"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s اختيارات"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "خيارات ماندريبا لينكس"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "كل الحزم، أبجدياً"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "كل الحزم، بتوافر التحديث"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "كل الحزم، بالحجم"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "كل الحزم، بحالة الإختيار"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "المتروكات فقط، مرتبة حسب تاريخ التثبيت"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "كل الحزم، بالمجموعة"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "تحديثات عادية"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "تحديثات أمنية"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "تحديثات ازالة العيوب"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "تحديثات عادية"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "تحديثات أمنية"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "في الأسماء"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "في الوصف"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "في أسماء الملفات"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "خطأ: يبدو أن %s مركّب بوضع القراءة فقط."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "عليك اختيار بعض الحزم أولاً."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "تم اختيار حزم كثيرة"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1363,133 +1760,171 @@ msgstr ""
 "\n"
 "هل تريد فعلا تثبيت الحزم؟"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_ملف"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_تحديث الوسط"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_إعادة تعيين الاختيار"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/إعادة تحميل _لائحة الحزم"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_خروج"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>خ"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_خيارات"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "مدير وسائط البرمجيات"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/إظ_هار الحزم المُحدّدة آلياً"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/مسا_عدة"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_تقرير خطأ"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_حول..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "معالج حزم ماندريبا (Rpmdrake)"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "معالج حزم ماندريبا (Rpmdrake) %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Arabeyes <support@arabeyes.org>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "ابحث عن:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "ابحث"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "إمحي"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "تحديد الكل"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "تطبيق"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "خروج"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "خطأ قاتل"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "ظهر خطأ قاتل: %s"
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "الرجاء الانتظار"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "تثبيت الحزم..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "جاري البدء..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "تهيئة الشّبكة المحليّة"
+msgstr "التهيئة"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1501,12 +1936,13 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "وسيط تحديث موجود مسبقاً"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1520,12 +1956,13 @@ msgstr ""
 "البرامج لتمكين واحد على الأقل (قم بالتأشير عليها في عامود التمكين؟).\n"
 "ثم قم بإعادة تشغيل أداة %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "كيفية اختيار المرآة يدوياً"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1539,56 +1976,73 @@ msgstr ""
 "\n"
 "ثم أعد تشغيل أداة %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "في الوصف"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "اتنظر من فضلك، جاري ايجاد الحزم المتوفرة..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "انتظر من فضلك، جاري قراءة قاعدة بيانات الحزم..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "انتظر من فضلك، جاري سرد الحزم..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "اتنظر من فضلك، جاري ايجاد الحزم المتوفرة..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "جاري التحقق من %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "التغييرات:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "احذف .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "استخدم .%s كملف رئيسي"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "لا تفعل شيئاً"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "انتهى التثبيت"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "تحقَّق..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "مشكلة أثناء التثبيت"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1598,17 +2052,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "تعذر الحصول على الحزم المصدرية"
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "تعذر الحصول على الحزم المصدرية، عفواً %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1620,67 +2075,103 @@ msgstr ""
 "الأخطاء المقررة:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"لإرضاء المُعتمدات، سيتم تثبيت الحزم %d التّالية:\n"
+"%s\n"
+msgstr[1] ""
+"لإرضاء المُعتمدات، سيتم تثبيت الحزم %d التّالية:\n"
+"%s\n"
+msgstr[2] ""
+"لإرضاء المُعتمدات، سيتم تثبيت الحزم %d التّالية:\n"
+"%s\n"
+msgstr[3] ""
 "لإرضاء المُعتمدات، سيتم تثبيت الحزم %d التّالية:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "احذف مفتاح"
+msgstr[1] "احذف مفتاح"
+msgstr[2] "احذف مفتاح"
+msgstr[3] "احذف مفتاح"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"هل من الممكن المتابعة؟"
+msgstr[1] ""
+"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
+"\n"
+"%s\n"
+"\n"
+"هل من الممكن المتابعة؟"
+msgstr[2] ""
+"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
+"\n"
+"%s\n"
+"\n"
+"هل من الممكن المتابعة؟"
+msgstr[3] ""
 "يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
 "\n"
 "%s\n"
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "جاري البدء..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "تثبيت الحزم..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "الرجاء الانتظار"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"هل من الممكن المتابعة؟"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "غير الوسيط"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "فضلاً أدخل الوسيط المسمى \"%s\" الى الجهاز [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "جاري تنزيل الحزمة `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "جاري التأكد من توقيعات الحزم..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1694,12 +2185,13 @@ msgstr ""
 "\n"
 "هل تريد متابعة التثبيت؟"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "فشل التثبيت"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1711,26 +2203,28 @@ msgstr ""
 "\n"
 "ربما تحتاج الى تحديث فاعدة بيانات الوسائط ."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "جاري تحضير الحزم للتثبيت..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "جاري التحضير..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "لم أتمكّن من التّوصّل لإلى ملفّ rpm [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1742,33 +2236,48 @@ msgstr ""
 "تم انشاء بعض ملفات التهيئة مثل `.rpmnew' أو `.rpmsave'،\n"
 "يمكنك الآن التحقق من بعضها لكي تقوم بالمطلوب منها:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "معلومات عادية"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "تأتي هذه الحزم مع معلومات التّحديث"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "معلومات أكثر حول الحزمة..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "معلومات أكثر حول الحزمة... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "خطأ"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "خطأ غير قابل للتصحيح: تعذر ايجاد حزمة للتثبيت، عفواً."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "انتظر من فضلك، جاري ازالة الحزم..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "ظهرت مشاكل أثناء الحذف"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1778,11 +2287,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "أهلاً بكم"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1794,8 +2305,8 @@ msgstr ""
 "هذه الأداة ستسمح لك باختيار البرامج التي تريد ازالتها\n"
 "من جهازك."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1807,11 +2318,13 @@ msgstr ""
 "هذه الأداة ستساعدك في اختيار التحديثات التي تريد تثبيتها على\n"
 "جهازك."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "أهلاً إلى أداة تثبيت البرامج!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1825,174 +2338,213 @@ msgstr ""
 "برامجية على أقراص CDROM أو DVD. ستساعدك هذه الأداة في اختيار البرامج\n"
 "اّلتي تريد تثبيتها على حاسوبك."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "تحديث ماندريبا لينكس"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "تحديث البرامج"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "تحديث ماندريبا لينكس"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "الرجاء إدخال عنوان بريدك الألكتروني أدناه "
 
-#: ../rpmdrake.pm:130
-#, fuzzy
+#: ../rpmdrake.pm:132
+#, fuzzy, c-format
 msgid "User name:"
 msgstr "إسم المستخدم:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "حذف حزم البرامج"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "تحديث حزم البرامج"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "تثبيت الحزم البرمجية"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "لا"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "نعم"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "معلومات..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "النمسا"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "أوستراليا"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "بلجيكا"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "البرازيل"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "كندا"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "السويسرية"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "كوستاريكا"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "جمهورية التشيك"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "ألمانيا"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "الدنمارك"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "اليونان"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "أسبانيا"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "فنلندا"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "فرنسا"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "المجر"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "اسرائيل"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "ايطاليا"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "اليابان"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "كوريا"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "هولندا"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "النرويج"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "بولندا"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "البرتغال"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "روسيا"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "السويد"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "سنغافورة"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "سلوفاكيا"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "تايوان"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "المملكة المتحدة"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "الصين"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "الولايات المتحدة"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2004,7 +2556,8 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة؟"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2016,26 +2569,28 @@ msgstr ""
 "\n"
 "هل من الممكن المتابعة ؟"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s اختيارات"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "إنتظر من فضلك، يجري تنزيل عناوين المرايا."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "إنتظر من فضلك، يجري تنزيل عناوين المرايا من موقع ماندريبا."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "خطأ أثناء التنزيل"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2050,7 +2605,7 @@ msgstr ""
 "الرجاء المحاولة لاحقاً."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2065,14 +2620,17 @@ msgstr ""
 "حاول مجدّدا في وقت لاحق من فضلك."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "لا مرايا"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "لم يمكن العثور على أية مرآة ملائمة."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2087,63 +2645,68 @@ msgstr ""
 "من طرف تحديثات ماندريبا لينكس الّرسمية."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "فضلاً اختر المرآة المطلوبة."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "جاري نسخ الملف للوسيط `%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "جاري اختبار الملف للوسيط `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "جاري اختبار الملف البعيد للوسيط `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " تم."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " فشل!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s من الوسيط %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "جاري بدء تنزيل `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "تنزيل `%s'، الوقت المتبقي:%s، السرعة:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "تنزيل `%s'، السرعة:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "انتظر من فضلك، جاري تحديث الوسائط..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "خطأ في استرجاع الحزم"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2158,29 +2721,29 @@ msgstr ""
 "لإعداده من جديد، و إمّا الوسيط غير قابل للوصل حاليا و بالتّالي فعليك\n"
 "بالمحاولة مجدّدا فيما بعد."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "حدّث الوسائط"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "اختر الوسائط التي تريد تحديثها:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "تحديد الكل"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "حدّث"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2192,8 +2755,8 @@ msgstr ""
 "الأخطاء:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2203,16 +2766,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "تعذر انشاء الوسيط"
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "فشل عند إضافة الوسيط"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2222,8 +2787,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2232,8 +2797,8 @@ msgstr ""
 "وسيطك `%s'، المُستخدَم للتّحديثات، لا يطابق النسخة %s الّتي تعمل عليها (%s).\n"
 "سيتمّ تعطيله."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2243,11 +2808,13 @@ msgstr ""
 "s).\n"
 "سيتمّ تعطيله."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "تشغيل المساعدة في الخلفية"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "تم بدء نافذة المساعدة، يجب أن تظهر بشكل قصير على سطح المكتب."
@@ -2522,21 +3089,22 @@ msgstr "احذف البرنامج"
 msgid "Software Media Manager"
 msgstr "مدير وسائط البرمجيات"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "انتظر من فضلك، جاري قراءة قاعدة بيانات الحزم..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "معالج حزم ماندريبا (Rpmdrake)"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "تعذر ايجاد حزم للتثبيت."
 
-#~ msgid "Stop"
-#~ msgstr "قف"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "كل الحزم، بمخزن الوسيط"
 
-#~ msgid "Normal information"
-#~ msgstr "معلومات عادية"
-
 #~ msgid "Maximum information"
 #~ msgstr "أقضى المعلومات"
 
@@ -2558,8 +3126,5 @@ msgstr "مدير وسائط البرمجيات"
 #~ msgid "Keys"
 #~ msgstr "المفاتيح"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "معالج حزم ماندريبا (Rpmdrake) %s"
-
 #~ msgid "/_View"
 #~ msgstr "/_عرض"
diff --git a/po/az.po b/po/az.po
index 154f26f9..a9efac17 100644
--- a/po/az.po
+++ b/po/az.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +22,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -41,17 +44,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "Normal yeniləmələr"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -66,87 +70,104 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Xahiş edirik gözləyin, mediya yenilənir..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Mediyum əlavə et"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Yerli fayllar"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Cığır:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP vericisi"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP vericisi"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP vericisi"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Cığır ya da bağlama nöqtəsi:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Çıxardıla bilən avadanlıq"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Cığır ya da bağlama nöqtəsi:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Gəz..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Giriş:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Şifrə:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist'in nisbi cığırı:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Boş buraxılsa, synthesis/hdlist avtomatik olaraq yoxlanacaq"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Ad:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "Yeniləmək istədiyiniz mediyanı seçin:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -154,112 +175,132 @@ 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
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Mediyum əlavə edilir:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Mediyum növü:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Oldu"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Paketlər qurulum üçün hazırlanır..."
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "həmişə"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "heç bir vaxt"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Bə'zi paketlər qurula bilməz"
 
-#: ../edit-urpm-sources.pl:325
-#, fuzzy
+#: ../edit-urpm-sources.pl:334
+#, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "`%s' endirilir, sür'ət:%s"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Mənbə Silinməsi"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "\"%s\" mediumunu silmək istəyirsiniz?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Xahiş edirik gözləyin, mediyum silinir..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Mediyumu düzəlt"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" mediyumu dəyişdirilir:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Dəyişiklikləri qeyd et"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Vəkil..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Davam etmək üçün mediyumu daxil etməlisiniz"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Vəkilləri quraşdır"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "\"%s\" mediası üçün vəkil qurğuları"
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Qlobal vəkil qurğuları"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -267,139 +308,173 @@ msgstr ""
 "Əgər vəkil vericisinə ehtiyacınız varsa, qovşaq adını və istəsəniz qapısını "
 "girin (yazma qaydası: <vəkilqovşaqadı[:qapı]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Vəkil qovşaq adı:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "İstifadəçi:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Paralel qrup əlavə et"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Paralel qrupu düzəlt"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Mənbə sərhədi əlavə et"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Qovşaq əlavə et"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "\"%s\" paralel qrupu dəyişdirilir:"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Qrup adı:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Mediya sərhədi:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Əlavə Et"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Sil"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Qovşaqlar:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Paralel urpmi-ni quraşdır"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Qrup"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Mediya sərhədi"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Mediya sərhədi"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Əmr"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(heç biri)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Düzəlt..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Əlavə Et..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Paketlərin digital imzaları üçün açarları idarə edin"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Mediyum"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Açar əlavə et"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Bağla"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Açarı sil"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -407,33 +482,38 @@ msgstr ""
 "%s açarını %s mediumundan silmək istəyirsiniz?\n"
 "(açar adı: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Açar əlavə et..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Açarı sil"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Mediyanı quraşdır"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Fəal?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Yenilə"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -443,34 +523,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Əlavə Et..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Yenilə..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Açarları idarə et..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../edit-urpm-sources.pl:1007
-#, fuzzy
+#: ../edit-urpm-sources.pl:1025
+#, fuzzy, c-format
 msgid "Global options..."
 msgstr "Qlobal vəkil qurğuları"
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Yardım"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -480,7 +564,8 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -494,7 +579,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -505,12 +591,13 @@ 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:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Medium əlavə edilə bilmədi, səhv ya da əksik arqumentlər"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -520,8 +607,8 @@ msgstr ""
 "Bunun köməyi ilə sisteminizə bu mediyumdan yeni\n"
 "proqram tə'minatları əlavə edə biləcəksiniz."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -531,85 +618,96 @@ msgstr ""
 "Bunun köməyi ilə sisteminizə bu mediyumdan yeni\n"
 "proqram tə'minatları əlavə edə biləcəksiniz."
 
-#: ../gurpmi.addmedia:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "`%s' mediyumu müvəffəqiyyətlə əlavə edildi."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "`%s' mediyumu müvəffəqiyyətlə əlavə edildi."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "İstifadə qaydası: %s [SEÇİM]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
-#, fuzzy
+#: ../rpmdrake:45
+#, fuzzy, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - ancaq yeniləmə medyanı yenilə.\n"
 
-#: ../rpmdrake:45
-#, fuzzy
+#: ../rpmdrake:46
+#, fuzzy, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - sadəcə paket adlarını göstər.\n"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
-#, fuzzy
+#: ../rpmdrake:50
+#, fuzzy, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                      DrakBackup Demon Raportu\n"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "İstifadəçi modunda işləyir"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -619,547 +717,784 @@ 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Yetişmə Qabiliyyəti"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arxivləmə"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Ehtiyatlama"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Cd yazma"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Sıxışdırma"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Digər"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Kitablar"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Kompüter kitabları"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Çox Soruşulan Suallar"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howto sənədləri"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Ədəbiyyat"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Klaster"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "İsmarış Keçməsi"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Xidmətlər Növbəyə Alınır"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Rabitə"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Mə'lumat bazaları"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "İnkişaf"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME və GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE və Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Çəyirdək"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editorlar"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Maarif"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulyatorlar"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Fayl vasitələri"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Oyunlar"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Macəra"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Əyləncə"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Lövhə oyunları"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kartlar"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Tapmacalar"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "İdman"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategiya"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Qrafiki masa üstü"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM əsaslı"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Qrafika"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "İzləmə"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedya"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Şəbəkə"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Söhbət"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Fayl transferi"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Canlı ismarışlaşma"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Poçt"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Xəbərlər"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Uzaqdan yetişmə"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Offis"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Açıq Açarlar"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Nəşr"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Elm"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomiya"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biyologiya"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Kimya"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Kompüter elmi"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geologiya elmləri"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Riyaziyyat"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Qabıqlar"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Səs"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistem"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Əsas"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Quraşdırma"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Açılış və Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Avadanlıq"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Paketləmə"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Çap"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "İnkişaf"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "İnkişaf"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Yazı növləri"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsol"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Növ1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitməpi"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Yerliləşdirmə"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Çəyirdək və avadanlıq"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Kitabxanalar"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Vericilər"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminallar"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Mətn vasitələri"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Oyuncaqlar"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "İş Stansiyası"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Konsol Vasitələri"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Sənədlər"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Oyun stansiyası"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "İnternet stansiyası"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimedya stansiyası"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Şəbəkə Kompüteri (alıcı)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Ofis İş Stansiyası"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Qrafiki Mühit"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME iş stansiyası"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Masa üstü"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE iş stansiyası"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Başqa qrafiki ara üzlər"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Verici"
+
+#: ../rpmdrake:357
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "DNS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Mə'lumat Bazası"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Atəş Divarı/İstiqamətləndirici"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Şəbəkə Kompüter vericisi"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Veb/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Mövcud deyil)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Axtarış nəticələri"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Axtarış nəticələri (heçnə)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Xahiş edirik gözləyin, axtarılır..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Əlvə edilə bilən"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Tə'minat Mənbələri İdarəçisi"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Dayan"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Yenilənə bilən"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Seçili deyil"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Əlvə edilə bilən"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Seçili"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Seçili deyil"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Vaciblik: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Yeniləmə səbəbi: "
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Təhlükəsizlik yeniləmələri"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "İzahat yoxdur"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Fayllar:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Dəyişmə qeydi:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Fayllar:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Dəyişmə qeydi:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Mediyum: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Hazırda qurulu olan buraxılış: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Ad: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Buraxılış: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Böyüklük: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "İcmal: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "İzahat: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Tə'minat Mənbələri İdarəçisi"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Paket haqqında daha çox mə'lumat..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Aşağıdakı paketlərin birinə ehtiyac var:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Xahiş edirik seçin"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Aşağıdakı paketlərin birinə ehtiyac var:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Xahiş edirik gözləyin, paketlər sıralanır..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Yeniləmə yoxdur"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1169,34 +1504,41 @@ 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:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Hamısı"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Daha çox mə'lumat"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Paketlər haqqında mə'lumat"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Bə'zi əlavə paketlər kənar edilməlidir"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Asılılıqlarına görə, bu paket(lər) də silinməlidir "
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Bə'zi paketlər silinə bilməz"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1204,7 +1546,8 @@ msgstr ""
 "Bu paketləri çıxartmaq sisteminizi xarab edəcək, üzr istəyirik:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1214,11 +1557,13 @@ msgstr ""
 "seçilməməlidir:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Əlavə paketlərə ehtiyac var"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1228,132 +1573,159 @@ msgstr ""
 "qurulmalıdır:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Bə'zi paketlər qurula bilməz"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Bə'zi paketlər qurula bilməz"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "Bağışlayın, aşağıdakı paket(lər) seçilə bilməz:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Bəzi paketlər kənar edilməlidir"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Seçili: %s / Boş disk sahəsi: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Seçili böyüklük: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "BU paketin izahatı mövcud deyil\n"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Ölümcül xəta yarandı: %s."
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Qur"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Qur"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux seçimləri"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Bütün paketlər, əlifba sırasına görə"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Bütün paketlər, yeniləmə imkanlarına görə"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Bütün paketlər, böyüklüklərinə görə"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Bütün paketlər, seçim vəziyyətinə görə"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Qurulma tarixinə görə sıralanmış, yalnız yarpaqlar"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Bütün paketlər, qrupa görə"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Normal yeniləmələr"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Təhlükəsizlik yeniləmələri"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Xəta düzəltməsi yeniləmələri"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Normal yeniləmələr"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Təhlükəsizlik yeniləmələri"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "adlarda"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "izahatlarda"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "fayl adlarında"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Əvvəlcə bə'zi paketləri seçməlisiniz."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Həddindən artıq çox paket seçilib"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1368,137 +1740,171 @@ msgstr ""
 "\n"
 "Həqiqətən də bütün seçili paketləri qurmaq istəyirsiniz?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Fayl"
 
-#: ../rpmdrake:1191
-#, fuzzy
+#: ../rpmdrake:1320
+#, fuzzy, c-format
 msgid "/_Update media"
 msgstr "Mediyanı yenilə"
 
-#: ../rpmdrake:1201
-#, fuzzy
+#: ../rpmdrake:1331
+#, fuzzy, c-format
 msgid "/_Reset the selection"
 msgstr "Seçimi sıfırla"
 
-#: ../rpmdrake:1213
-#, fuzzy
+#: ../rpmdrake:1344
+#, fuzzy, c-format
 msgid "/Reload the _packages list"
 msgstr "Paket siyahısını yenidən yüklə"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/Çı_x"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Seçimlər"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Tə'minat Mənbələri İdarəçisi"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
-#, fuzzy
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, fuzzy, c-format
 msgid "/_Show automatically selected packages"
 msgstr "Avtomatik seçili paketləri göstər"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Xəta Raportu Göndər"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Haqqında..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Onlayn"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Mətin Əmirov <metin@karegen.com>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Axtar:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Axtar"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Təmizlə"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, fuzzy, c-format
+msgid "Select all"
+msgstr "Seçili"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Tədbiq Et"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Çıx"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Ölümcül xəta"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Ölümcül xəta yarandı: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Xahiş edirik, gözləyin"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Paket qurulumu..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Hazırlanır..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "Yerli Şəbəkə Quraşdırılması"
+msgstr "Quraşdırma"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1510,12 +1916,13 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Onsuzda mövcud olan yeniləmə mediyası"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1531,12 +1938,13 @@ msgstr ""
 "\n"
 "Daha sonra, %s'i yenidən başladın."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Əksinizin əl ilə necə seçiləcəyi"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1550,56 +1958,73 @@ msgstr ""
 "\n"
 "Daha sonra, %s'i yenidən başladın."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "izahatlarda"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Xahiş edirik gözləyin, mövcud paketlər tapılır..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Xahiş edirik gözləyin, paket mə'lumat bazası oxunur..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Xahiş edirik gözləyin, paketlər sıralanır..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Xahiş edirik gözləyin, mövcud paketlər tapılır..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "%s yoxlanır"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "dəyişikliklər:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "%s'i sil"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "%s faylını əsas fayl olaraq işlət"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Heç bir şey etmə"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Qurulum bitdi"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Təftiş Et..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "İstənən bütün paketlər müvəffəqiyyətlə quruldu."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Qurma əsnasında problem"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1609,17 +2034,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Mənbə paketləri alına bilmədi."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Mənbə paketləri alına bilmədi, üzr istəyirik. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1631,66 +2057,72 @@ msgstr ""
 "Raport edilən xəta(lar):\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakı %d paket də qurulmalıdır (%d MB)"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Açarı sil"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Paketlərin yenilənməsi üçün aşağıdakı paketlər kənar edilməlidir:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Davam edilsin?"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
 msgstr ""
-"Paketlərin yenilənməsi üçün aşağıdakı paketlər kənar edilməlidir:\n"
-"\n"
 "%s\n"
 "\n"
 "Davam edilsin?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Hazırlanır..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Paket qurulumu..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Xahiş edirik, gözləyin"
-
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Mediyumu dəyişdir"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Xahiş edirik, \"%s\" adlı mediyanı [%s] avadanlığına daxil edin"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' paketi endirilir (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Paketlərin imzaları yoxlanır..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1704,12 +2136,13 @@ msgstr ""
 "\n"
 "Yenə də qurulumu davam etdirmək istəyirsiniz?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Qurulum bacarılmadı"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1721,26 +2154,28 @@ msgstr ""
 "\n"
 "Mediya mə'lumat bazasını yeniləməyi məsləhət görürük."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Paketlər qurulum üçün hazırlanır..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Hazırlanır..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Qurulan paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm faylı [%s] çatıla bilmir"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1752,34 +2187,49 @@ msgstr ""
 "`.rpmnew' ya da `.rpmsave' adı altında qurğu faylları yaradıldı,\n"
 "indi siz bə'zilərini yoxlaya bilərsiniz:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Normal mə'lumat"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Bu paketlər yeniləmə məlumatı ilə bərabər gəlir"
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
 msgstr "Paket haqqında daha çox mə'lumat..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
+msgstr "Paket haqqında daha çox mə'lumat..."
+
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Xəta"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 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:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Xahiş edirik gözləyin, paketlər silinir..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Silmə əsnasında problemlər"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1789,11 +2239,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Xoş Gəldiniz"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1805,8 +2257,8 @@ msgstr ""
 "Bu vasitə sizə kompüterinizdən silmək istədiyiniz proqramları seçməkdə\n"
 "yardım edəcək."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1818,11 +2270,13 @@ msgstr ""
 "Bu vasitə sizə kompüterinizə qurmaq istədiyiniz yeniləmələri seçməkdə\n"
 "yardım edəcək."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1836,175 +2290,213 @@ msgstr ""
 "Bu vasitə sizə kompüterinizə qurmaq istədiyiniz tə'minatları seçməkdə\n"
 "yardım edəcək."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "Proqram Tə'minatlarının Yenilənməsi"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Xahiş edirik, aşağıya epoçt ünvanınızı daxil edin"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "İstifadəçi adı:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Proqram Tə'minatlarının Silinməsi"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Proqram Tə'minatlarının Yenilənməsi"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Proqram Tə'minatlarının Qurulması"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Xeyir"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Bəli"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Mə'lumat..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Avstriya"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Avstraliya"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belçika"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Braziliya"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "İsveçrə"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Çex Respublikası"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Almanya"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Yunanıstan"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "İspaniya"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Fransa"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Macarıstan"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "İsrail"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "İtaliya"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Yaponiya"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Koreya"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Hollandiya"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norveç"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polşa"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portuqaliya"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusiya"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "İsveç"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Sinqapur"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakiya"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Birləşmiş Krallıq"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Çin"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Birləşmiş Ştatlar"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2016,7 +2508,8 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2028,28 +2521,30 @@ msgstr ""
 "\n"
 "Davam edilsin?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Xahiş edirik gözləyin, Mandriva veb saytından əkslərin ünvanları endirilir."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Xahiş edirik gözləyin, Mandriva veb saytından əkslərin ünvanları endirilir."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Endirmə əsnasında xəta"
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2064,7 +2559,7 @@ msgstr ""
 "Xahiş edirik, daha sonra yenidən sınayın."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2079,14 +2574,17 @@ msgstr ""
 "Xahiş edirik, daha sonra yenidən sınayın."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Əkssiz"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2101,63 +2599,68 @@ msgstr ""
 "tərəfindən dəstəklənməməsidir."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Xahiş edirik uyğun əksi seçin."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' mediyumu üçün köçürülür..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Mediyumun `%s' faylı yoxlanılır..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Mediyumun uzaqdakı`%s' faylı yoxlanır..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " bitdi."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr "bacarılmadı!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%2$s mənbəsindən %1$s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' endirilməyə başlanır..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' endirilir, qalan vaxt:%s, sür'ət:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' endirilir, sür'ət:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Xahiş edirik gözləyin, mediya yenilənir..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Paketlər alına bilmədi"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2169,30 +2672,29 @@ 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:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Mediyanı yenilə"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Yeniləmək istədiyiniz mediyanı seçin:"
 
 #: ../rpmdrake.pm:764
-#, fuzzy
-msgid "Select all"
-msgstr "Seçili"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Yenilə"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2204,8 +2706,8 @@ msgstr ""
 "Xətalar:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2215,16 +2717,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Mediyum yaradıla bilmir."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Medium əlavə etmə xətası"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2234,8 +2738,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:850
+#, fuzzy, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2245,8 +2749,8 @@ msgstr ""
 "(%s) uyğun gəlmi.\n"
 "O indi qeyri-fəallaşdırılacaqdır."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2256,11 +2760,13 @@ msgstr ""
 "(%s) uyğun gəlmi.\n"
 "O indi qeyri-fəallaşdırılacaqdır."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Yardım arxa planda başladı"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 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."
@@ -2535,21 +3041,22 @@ msgstr "Proqram Sil"
 msgid "Software Media Manager"
 msgstr "Tə'minat Mənbələri İdarəçisi"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Xahiş edirik gözləyin, paket mə'lumat bazası oxunur..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Qurulum üçün paket tapılmadı."
 
-#~ 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"
 
@@ -2571,9 +3078,6 @@ msgstr "Tə'minat Mənbələri İdarəçisi"
 #~ msgid "Keys"
 #~ msgstr "Açarlar"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/_Görünüş"
 
diff --git a/po/bg.po b/po/bg.po
index 59438666..bead731d 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +20,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Избор на носител"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -48,16 +51,18 @@ msgstr ""
 "източника, но чрез две\n"
 "стъпки.)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Източници на дистрибуцията"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Официални обновявания"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -75,89 +80,107 @@ msgstr ""
 "в интернет.\n"
 "Да продължа ли ?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Моля, изчакайте. Обновява се източник..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Добавяне на източник"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Локални файлове"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Път:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP сървър"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP сървър"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP сървър"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Път или точка на монтиране:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Преместваемо устройство"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Път или точка на монтиране:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Търси..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Потребителско име:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Релативен път до директория или hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 "Ако бъде оставено празно, synthesis/hdlist ще бъдат автоматично потърсени."
 
 # c-format
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Име:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Създаване на източник за цялята дистрибуция"
 
 # c-format
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "Моля изберете източници които искате да се подновят:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Трябва да попълните поне първите 2 точки."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -165,113 +188,136 @@ msgstr ""
 "Вече има източник с това име.Наистина ли\n"
 "желаете да го замените?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Добавяне на източник:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Тип на източника:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Добре"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Глобални настройки за инсталация на пакети"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "винаги"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "никога"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Проверка на RPM пакет за инсталация:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Сваляне на програма:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Премахване на източник"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Сигурни ли сте,че желаете да изтриете източник \"%s\"?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr ""
 "Моля Изчакайте\n"
 "Премахва се източник"
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Редактиране на източник"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Редактиране на източник \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Запазва промените"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Прокси..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Вие трябва да поставите източника за да продължите"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 "За да запазите промените, вие трябва първо да поставите източника в "
 "устройството."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Конфигуриране на проксита"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Прокси настройки за източник \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Глобални прокси настройки"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -279,141 +325,175 @@ msgstr ""
 "Ако се нуждаете от прокси, въведете име на хост и опционално порт (синтаксис:"
 "<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Адрес на прокси:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Вие трябва да зададете име/парола за идентификация пред проксито:"
 
 # c-format
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Потребител:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Добавяне на паралелна група"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Редактиране на паралелна група"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Добавя ограничение на източници"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Изберете източник за добавяне към лимита на източници:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Добавяне на хост"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Вид на хоста или IP адреса за добавяне:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Редактиране на паралелна група \"%s\":"
 
 # c-format
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Име на група:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Лимит на източници:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Добави"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Изтрива"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Хостове:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Настройка на паралелно urpmi (споделено изпълнение на urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Група"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Лимит на източници"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Лимит на източници"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(няма)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Редактира"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Добавя..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Работа с ключове за електронните подписи на пакетите"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Среден"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 "не бе намерено име,следователно ключът не съществува в rpm ключодържателя"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Добавяне на ключ"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Изберете ключ за добавяне към източник %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Затвори"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Изтриване на ключ"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -421,33 +501,38 @@ msgstr ""
 "Сигурни ли сте,че желаете да изтриете ключ %s от източник %s?\n"
 "(име на ключа: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Добавяне на ключ..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Изтрива ключ"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Настройка на източник"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Да разреша?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Обновяване"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -457,32 +542,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Добавя..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Обновяване..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Работа с ключове..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Паралелно..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Глобални настройки..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Помощ"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -492,7 +583,8 @@ msgstr ""
 "\n"
 "Да продължа ли?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -506,7 +598,8 @@ msgstr ""
 "които ще използвате.След това те ще бъдат ползвани при инсталиране\n"
 "или обновяване на пакети."
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -517,12 +610,13 @@ msgstr ""
 "изполават базата с пакеите (проверете дали не сте стартирали менажера на "
 "пакети повече от веднъж?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Източникът нее може да бъде добавен - грешни или липсващи аргументи"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -532,8 +626,8 @@ msgstr ""
 "Благодарение на това ще можете да инсталирате нов софтуер\n"
 "на вашият компютър."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -543,85 +637,97 @@ msgstr ""
 "Благодарение на това ще можете да инсталирате нов софтуер\n"
 "на вашият компютър."
 
-#: ../gurpmi.addmedia:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "Източникът `%s' е добавен успешно."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Източникът `%s' е добавен успешно."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Изпозлване: %s [ОПЦИЯ]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
-#, fuzzy
+#: ../rpmdrake:45
+#, fuzzy, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - обновява само източниците за обновяване.\n"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
-#, fuzzy
+#: ../rpmdrake:50
+#, fuzzy, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                      DrakBackup Рапорт \n"
 "\n"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "В потребителски режим"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -631,549 +737,787 @@ msgstr ""
 "Няма да имате права да правите промени,\n"
 "все пак може да разгледате съществуващата база."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Достъпност"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Архивиране"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Резервно копиране"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Запис на дискове"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Компресия"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Друг"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Книги"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Компютърни книги"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Често задавани въпроси ( с отговори)"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Документи от вида \"Как да...\""
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Литература"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Клъстер"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Съобщение"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Изчакващи услуги"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Комуникации"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Базата данни"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Разработки"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "ГНОМ и GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "КДЕ и Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Ядро"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Питон"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Редактори"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Обучение"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Емулатори"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Инструменти за работа с файлове"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Игри"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Приключенски"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Аркадни"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "На дъска"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Карти"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Пъзели"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Спортни"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Стратегия"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Графичен работен плот"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM базирано"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "ГНОМ"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Графики"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Наблюдение"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Мултимедия"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Мрежа"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Чат"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Трансфер на файлове"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Моментни съобщения"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Е-поща"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Новини"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Отдалечен достъп"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Офис"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Публични ключове"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Издателски"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Науки"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Астрономия"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Биология"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Химия"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Компютърни науки"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Гео науки"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Шелове"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Звук"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Система"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Основа"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Настройка"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Зареждане"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Хардуер"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Работа с пакети"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Печатане"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Разработки"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Разработки"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Конзола"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Тип1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "Х11 битмап"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Интернационализация"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Ядро и хардуер"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Библиотеки"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Сървъри"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Терминали"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Инструменти за работа с текст"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Играчки"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Работна станция"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Конзолни инструменти"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Документация"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Игрална станция"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Интернет станция"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Мутимедийна станция"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Мрежов компютър (клиент)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Офисна работна станция"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Научна работна станция"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Графична среда"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Gnome работна станция"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "настолен компютър"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE работна станция"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Други графични desktop-и"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Сървър"
+
+#: ../rpmdrake:357
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "FND/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Сървър, Бази-данни"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Сървър, Firewall/Рутер"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Мрежов компютър, сървър"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Сървър, Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Не е наличен)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Резултат от търсене"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Резултат от търсенето (няма)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Моля изчакайте, търся..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Възможни за добавяне"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Мениджър за софтуерни източници"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Стоп"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Обновим"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Не е избрано"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Възможни за добавяне"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Избрано"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Не е избрано"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Важност: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Причина за обновяване: "
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Обновявания свързани със сигурността"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Без описание"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Файлове:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Списък с промени:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Файлове:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Списък с промени:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Източник:"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Текущо инсталирана версия: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Име: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Версия: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s КБ"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Размер: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s КБ"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Резюме: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Описание: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Мениджър за софтуерни източници"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Повече информация от пакет..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Един от следните пакети е необходим:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Моля изберете"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Един от следните пакети е необходим:"
+msgstr[1] "Един от следните пакети е необходим:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Няма обновления"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1183,35 +1527,42 @@ msgstr ""
 "обновления за инсталираните пакети,или вече сте ги \n"
 "инсталирали."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Всичко"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Повече информация"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Информация за пакетите"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Някой допълнителни пакети трябва да се изтрият"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr ""
 "За да се удовлетворят зависимостите, следните пакети трябва бъдат премахнати:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Някои пакети не могат да бъдат деинсталирани"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1219,7 +1570,8 @@ msgstr ""
 "Премахването на тези пакети би разбило системата ви, съжалявам:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1229,11 +1581,13 @@ msgstr ""
 "от избора сега:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Трябва допълнителни пакети"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1243,132 +1597,164 @@ msgstr ""
 "да бъдат инсталирани:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (към листа с пропуснатите)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Някои пакети не могат да бъдат инсталирани"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Някои пакети не могат да бъдат инсталирани"
+msgstr[1] "Някои пакети не могат да бъдат инсталирани"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Съжалявам, следните пакети не могат да бъдат избрани:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Съжалявам, следните пакети не могат да бъдат избрани:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Някои пакети трябва да бъдат премахнати"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Избрани: %s / Свободно дисково пространство: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Общ размер %d МБ"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Няма описание на този пакет\n"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Получи се непоправима грешка: %s"
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Инсталация"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Инсталация"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s избрани"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Мандрива Линукс избрани"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Всички пакети по азбучен ред"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Всички пакети по възможност за обновяване"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Всички пакети,подредени по размер"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Всички пакети, подредени по състояние на избора"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Само \"листа\",сортирани по инсталационна дата"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Всички пакети,сортирани по група"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Стандартни обновявания"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Обновявания свързани със сигурността"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Обновяванията свързани със подобрения"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Стандартни обновявания"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Обновявания свързани със сигурността"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "по имена"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "в описанията"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "във файловите имена"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Трябва да изберете някакви пакети."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Твърде много пакети са избрани"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1384,133 +1770,171 @@ msgstr ""
 "\n"
 "Действително ли желаете да инсталирате всички избрани пакети ?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Обновяване на източниците"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Анулира избраното"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Презарежда списък с пакетите"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Изход"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Настройки"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Мениджър за софтуерни източници"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Покажи автоматично отбелязаните пакети"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/Помощ"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Информирай за бъг"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Относно..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Dimitar Terziev <mitak@unix-bg.org>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Търси:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Търси"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Изчистване"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Избери всички"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Приложи"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Изход"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Фатална грешка"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Получи се непоправима грешка: %s"
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Моля изчакайте"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Инсталиране на пакети..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Инициализация:"
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "Настройка на локална мрежа"
+msgstr "Настройка"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1522,12 +1946,13 @@ msgstr ""
 "в момента\n"
 ". Желаете ли да продължа?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Вече съществува този източник за обновяване"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1543,12 +1968,13 @@ msgstr ""
 "\n"
 "След това рестартирайте %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Как да изберете ръчно вашият огледален сървър"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1562,60 +1988,79 @@ msgstr ""
 "\n"
 "След това рестартирайте %s"
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "в описанията"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr ""
+"Моля изчакайте\n"
+"Пакетите се сортират"
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Преглеждам %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "промени:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Премахва .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Използва .%s като главен файл"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Не прави нищо"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Инсталацията приключи"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Преглежда..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Всички заявени пакети бяха инсталирани коректно."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Появиха се проблеми по време на инсталацията"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1625,17 +2070,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Не мога да получа пакетите."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Съжалявам,не мога да получа пакетите. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1647,26 +2093,45 @@ msgstr ""
 "Грешки:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"За да се задоволят зависимостите, следните %d пакети ще\n"
+"бъдат инсталирани:\n"
+"%s\n"
+msgstr[1] ""
 "За да се задоволят зависимостите, следните %d пакети ще\n"
 "бъдат инсталирани:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Изтриване на ключ"
+msgstr[1] "Изтриване на ключ"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
+"обновени:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Желаете ли да продължите?"
+msgstr[1] ""
 "Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
 "обновени:\n"
 "\n"
@@ -1674,42 +2139,41 @@ msgstr ""
 "\n"
 "Желаете ли да продължите?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Инициализация:"
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Инсталиране на пакети..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Моля изчакайте"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Да продължа ли?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Сменя източник"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Изтегляне на пакет `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Проверка подписите на пакетите..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1723,12 +2187,13 @@ msgstr ""
 "\n"
 "Искате ли да продължите въпреки това ?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Инсталацията пропадна"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1740,26 +2205,28 @@ msgstr ""
 "\n"
 "Вие трябва да обновите базата данни на вашия източник."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Подготвяне на пакетите за инсталация..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Подготовка..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталиране на пакет `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm файлът [%s] е недостъпен"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1771,36 +2238,51 @@ msgstr ""
 "Някой конфигурационни файлове бяха създадени като .rpmnew' или `.rpmsave'.\n"
 "Вие трябва да прегледате някой от тях за да предприемете действие:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Нормална информация"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Има информация за обновяване на тези пакети"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Повече информация от пакет..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Повече информация от пакет... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Грешка"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Непоправима грешка : не е намерен пакета за инсталация,много съжалявам."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Появиха се проблеми по време на премахването"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1810,11 +2292,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Добре дошли"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1826,8 +2310,8 @@ msgstr ""
 "Този инструмент ще ви помогне да изберете кои софтуерни пакети искате да\n"
 "изтриете от системата."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1839,11 +2323,13 @@ msgstr ""
 "Този инструмент ще ви помогне да изберете обновяване на вашият софтуер\n"
 "върху системата."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Добре дошли в помощника за инсталиране на софтуер!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1858,173 +2344,213 @@ msgstr ""
 "пакети\n"
 "вие искате да инсталирате на системата."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Мандрива Линукс обновяване"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Обновяване на софтуер"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Мандрива Линукс обновяване"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Моля, въведете долу вашият адрес на Ел. поща"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Потребител:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Изтриване на пакети"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Обновяване на пакети"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Инсталиране на софтуерни пакети"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Да"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Информация..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Австрия"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Австралия"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Белгия"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Швейцария"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Чехия"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Германия"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Дания"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Гърция"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Испания"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Финландия"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Франция"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Унгария"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Израел"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Италия"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Япония"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Корея"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Холандия"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Норвегия"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Полша"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Португалия"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Русия"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Тайван"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Обединеното кралство"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Китай"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "САЩ"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2036,7 +2562,8 @@ msgstr ""
 "в интернет.\n"
 "Да продължа ли ?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2048,26 +2575,28 @@ msgstr ""
 "в интернет.\n"
 "Да продължа ли ?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s избрани"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Моля, почакайте. Изтеглям огледалните адреси ."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Моля, почакайте. Изтеглям огледалните адреси от web сайта на Mandriva."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Грешка при изтегляне"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2082,7 +2611,7 @@ msgstr ""
 "такъв.Моля опитайте по-късно."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2097,14 +2626,17 @@ msgstr ""
 "такъв.Моля опитайте по-късно."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Няма огледален сървър"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Не мога да открия подходящо огледало."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2119,65 +2651,70 @@ msgstr ""
 "от официалните обновления на Мандрива Линукс."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 "Моля изчакайте\n"
 "Получавам списъка с огледални сървъри"
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Копиране на файл за източник '%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Проверявам файла от източника %s..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Проверка на файла от източник %s..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " край."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " провал!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s от източник %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Започва свалянето на `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Сваляне на '%s',оставащо време: %s,скорост: %s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Сваляне на '%s',със скорост %s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Моля, изчакайте. Обновява се източник..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Грешка при получаване напакетите"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2190,30 +2727,30 @@ msgstr ""
 "`%s'. В случаи, че този източник е нрправилно конфигуриран,\n"
 "можете да го премахнете, и да го добавите отново."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Обновяване на източниците"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
 # c-format
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Моля изберете източници които искате да се подновят:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Избери всички"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Обновяване"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2225,8 +2762,8 @@ msgstr ""
 "Грешки:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2236,16 +2773,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Невъзможност за създаване на източник."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Грешка при добавяне на източник"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2255,8 +2794,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2266,8 +2805,8 @@ msgstr ""
 "s), която използвате (%s).\n"
 "Ще бъде премахнат."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2277,11 +2816,13 @@ msgstr ""
 "на Mandriva Linux (%s).\n"
 "Ще бъде премахнат."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Помощ,стартирана във фонов режим"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2558,21 +3099,24 @@ msgstr "Изтрива софтуер"
 msgid "Software Media Manager"
 msgstr "Мениджър за софтуерни източници"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr ""
+#~ "Моля изчакайте\n"
+#~ "Пакетите се сортират"
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Не бе намерен пакет за инсталиране."
 
-#~ msgid "Stop"
-#~ msgstr "Стоп"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "Всички пакети подредени по източник на съхранение"
 
-#~ msgid "Normal information"
-#~ msgstr "Нормална информация"
-
 #~ msgid "Maximum information"
 #~ msgstr "Максимум информация"
 
@@ -2594,9 +3138,6 @@ msgstr "Мениджър за софтуерни източници"
 #~ msgid "Keys"
 #~ msgstr "Ключове"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/Изглед"
 
diff --git a/po/bn.po b/po/bn.po
index ebfe22c7..1f1fc21b 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,19 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "মাধ্যমের ধরন বাছাই করুন"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -41,16 +44,18 @@ msgstr ""
 "করবে, তা বাছাই করতে পারেন। (আপনি দুটোই যোগ করতে পারেন, কিন্তু আপনাকে এটি দুই "
 "ধাপে করতে হবে।)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "ডিস্ট্রিবিউশনের উত্‍‌স সমুহ"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "অফিসিয়াল আপ-ডেট সমুহ"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -68,88 +73,106 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "মাধ্যম যোগ করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "একটি মাধ্যম যোগ করুন"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "স্থানীয় ফাইল"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "পাথ:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "এফটিপি (FTP) সার্ভার"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "ইউআরএল (URL):"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "এফটিপি (FTP) সার্ভার"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "এইচটিটিপি (HTTP) সার্ভার"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "পাথ অথবা মাউন্ট পয়েন্ট:"
-
 # sgstr "অপসারণযোগ্য ডিভাইস"
 # মুছে ফেলা যাবে এমন ডিভাইস
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "অপসারণযোগ্য ডিভাইস"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "পাথ অথবা মাউন্ট পয়েন্ট:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "ব্রাউজ..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "লগ-ইন:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist-এর জন্য আপেক্ষিক পাথ:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "না লেখা হলে, স্বয়ংক্রিয়ভাবে synthesis/hdlist-এর অনুসন্ধান করা হবে"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "নাম:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "পুরো ডিস্ট্রিবিউশনের জন্য মাধ্যম তৈরি করো"
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "যে মাধ্যমটি আপনি আপ-ডেট করতে ইচ্ছুক তা নির্বাচন করুন:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "অন্তত প্রথম দুটি এন্ট্রি আপনার পুরণ করা আবশ্যক।"
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -157,109 +180,132 @@ msgstr ""
 "এই নামের একটি মাধ্যম বর্তমানে উপস্থিত আছে, আপনি কি এটি\n"
 "বদল করে পুনরায় স্থাপন করার বিষয়ে নিশ্চিত? "
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "নতুন মাধ্যম যোগ করা হচ্ছে:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "মাধ্যমের ধরন:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "ঠিক আছে"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "প্যাকেজ ইনস্টলেশন Global অপশন"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "সবসময়"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "কখনই নয়"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "ইনস্টল করার জন্য RPM সমুহের পরীক্ষন"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "ব্যবহার করার জন্য ডাউনলোড প্রোগ্রাম:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "সোর্স প্যাকেজ মুছে ফেলা"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "সোর্স প্যাকেজ \"%s\" সরিয়ে ফেলার বিষয়ে কি আপনি নিশ্চিত?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "মাধ্যম মুছে ফেলা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "মাধ্যম সম্পাদন করুন"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" মাধ্যমটি সম্পাদন করা হচ্ছে:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "পরিবর্তনগুলো সংরক্ষণ করো"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "প্রক্সি..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "পরবর্তী ধাপে এগোতে হলে আপনাকে একটি মাধ্যম ঢোকাতে হবে"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "পরিবর্তনগুলো সংরক্ষণ করতে হলে, আপনাকে একটি মাধ্যম ড্রাইভে ঢোকাতে হবে।"
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "প্রক্সি কনফিগার করো"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "\"%s\" মাধ্যমের প্রক্সি বৈশিষ্ট্যাবলীসমুহ"
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Global প্রক্সির বৈশিষ্ট্যাবলীসমুহ"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -267,140 +313,174 @@ msgstr ""
 "প্রক্সি প্রয়োজন হলে, হোস্টের নাম এবং একটি ঐচ্ছিক পোর্ট-এর তথ্য লিখুন (সিন্টেক্স: "
 "<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "প্রক্সির হোস্টের নাম:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "প্রক্সির অনুমোদনের জন্য আপনাকে একটি ব্যবহারকারীর নাম/পাসওয়ার্ড নির্ধারণ করতে হবে:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "ব্যবহারকারী:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "একটি সমান্তরাল দল যোগ করো"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "একটি সমান্তরাল দল সম্পাদন করো"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "মাধ্যমের সীমা যোগ করো"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "মাধ্যমের সীমায় যোগ করার জন্য একটি মাধ্যম নির্বাচন করুন"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "একটি হোস্ট যোগ করুন"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "যে হোস্টকে আপনি যোগ করতে ইচ্ছুক, তার নাম অথবা আইপি (IP) অ্যাড্রেস লিখুন:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "সমান্তরাল দল \"%s\"-কে সম্পাদন করা হচ্ছে:"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "দলের নাম:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "প্রোটোকল:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "মাধ্যমের সীমা:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "যোগ করো"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "মুছে ফেলো"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "হোস্ট:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "সমান্তরাল urpmi কনফিগার করো (urpmi এর বিতরণকৃত চালনা)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "দল"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "মাধ্যমের সীমা"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "প্রোটোকল"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "মাধ্যমের সীমা"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "কমান্ড"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(একটিও নয়)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "সম্পাদনা"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "যোগ করো..."
 
 # সিগনেচারের
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "প্যাকেজের ডিজিটাল সাক্ষরের জন্য কী ব্যবস্থাপনা কর"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "মাধ্যম"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "কোন নাম পাওয়া যায়নি, rpm কীরিং (keyring) এ কী (key)-টি নেই!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "একটি কী (key) যোগ করুন"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "%s মাধ্যমে যোগ করার জন্য একটি কী (key) নির্বাচন করুন"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "বন্ধ"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "একটি কী (key) মুছে ফেলুন"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -408,34 +488,39 @@ msgstr ""
 "%s কী (key)-টি %s মাধ্যম  থেকে সরিয়ে ফেলার বিষয়ে কি আপনি নিশ্চিত?\n"
 "(কী (key)-এর নাম: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "একটি কী (key) যোগ করুন..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "কী (key) মুছে ফেলুন"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "মাধ্যম কনফিগার করো"
 
 #  আছে কি
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "সক্রিয়?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "আপডেট"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -445,32 +530,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Custom যোগ করো..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "আপডেট করো..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "কী ব্যবস্থাপনা..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "সমান্তরাল..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Global অপশন সমুহ..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "সহায়িকা"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -481,7 +572,8 @@ msgstr ""
 "অগ্রসর হওয়া যাবে কি?"
 
 # উপলব্ধ
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -495,7 +587,8 @@ msgstr ""
 "সেগুলো আপনি এই টুলটির সাহায্যে কনফিগার করতে পারবেন। নতুন সফ্টওয়্যার\n"
 "প্যাকেজ ইনস্টল করতে অথবা আপডেট করার সময় এগুলো থাকবে।"
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -507,12 +600,13 @@ msgstr ""
 "কোন ডেস্কটপে কি আরেকটি মিডিয়া ম্যানজার চলছে, অথবা আপনি কি\n"
 "বর্তমানে প্যাকেজ ইনস্টল করছেন?)।"
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "মাধ্যম যোগ করা সম্ভব হয়নি, আর্গুমেন্ট সঠিক নয় অথবা অনুপস্থিত"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -522,8 +616,8 @@ msgstr ""
 "আপনি এই মাধ্যমের থেকে আপনার সিষ্টেমে নতুন সফ্টওয়্যার প্যাকেজ\n"
 "ইনস্টল করতে সক্ষম হবেন।"
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -533,85 +627,96 @@ msgstr ""
 "আপনি এই মাধ্যমের থেকে আপনার সিষ্টেমে নতুন সফ্টওয়্যার প্যাকেজ\n"
 "ইনস্টল করতে সক্ষম হবেন।"
 
-#: ../gurpmi.addmedia:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "`%s' মাধ্যমটি সাফল্যের সাথে যোগ করা হয়েছে।"
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "`%s' মাধ্যমটি সাফল্যের সাথে যোগ করা হয়েছে।"
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "ব্যবহার: %s [অপশনসমূহ] ..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
-#, fuzzy
+#: ../rpmdrake:45
+#, fuzzy, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - শুধুমাত্র আপডেট মাধ্যম আপডেট করো।\n"
 
-#: ../rpmdrake:45
-#, fuzzy
+#: ../rpmdrake:46
+#, fuzzy, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
-#, fuzzy
+#: ../rpmdrake:50
+#, fuzzy, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                      ড্র্যাকব্যাকআপ ডেম্যন রিপোর্ট\n"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "ব্যবহারকারীর মোডে চলছে"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -623,559 +728,797 @@ msgstr ""
 
 # sgstr "ব্যবহারযোগ্যতা"
 # sgstr "প্রবেশাধিকার"
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "ব্যবহার যোগ্যতা"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "আর্কাইভ করা"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "ব্যাক-আপ"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "সিডি (CD) বার্ণ করা"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "কম্প্রেশন"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "বই"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "কম্পিউটার সংক্রান্ত বই"
 
 # sgstr "প্রয়োজনীয় প্রশ্নাবলী"
 # sgstr "সাধারণ প্রশ্নাবলী"
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "সাহিত্য"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "ক্লাস্টার"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "তথ্য সঞ্চালন"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "সারিকরন সার্ভিস"
 
 # sgstr "সংযোগ-ব্যবস্থা"
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "যোগাযোগ"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "ডাটাবেস"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "ডেভেলপমেন্ট"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "গুনোম এবং GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "জাভা (Java)"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "কেডিই (KDE) এবং Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "কার্নেল"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "এডিটর"
 
 # sgstr "সংযোগ-ব্যবস্থা"
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "শিক্ষা"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "এমুলেটর"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "ফাইল সংক্রান্ত টুল"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "খেলা"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "রোমাঞ্চ"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "আর্কেড"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "ছক"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "তাস"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "ধাঁধা"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "খেলা"
 
 # sgstr "রণচাতুর্য"
 # sgstr "পরিচালন-দক্ষতা"
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "কৌশল"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "গ্রাফিক্যাল ডেস্কটপ"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "জ্ঞানবৃদ্ধি"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM ভিত্তিক"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "গুনোম"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "কেডিই (KDE)"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "স-ফিশ"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "উইন্ডোমেকার"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "গ্রাফিক্স"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "পর্যবেক্ষণ"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "মাল্টিমিডিয়া"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "ভিডিও"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "নেটওয়ার্ক করা"
 
 # আলাপন
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "আড্ডা (chat)"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "ফাইল আদানপ্রদান"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "আইআরসি (IRC)"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "ইনস্ট্যন্ট মেসেজ করা"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "মেইল"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "খবরাখবর (news)"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "দূরবর্তী প্রবেশ"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "অফিস"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "পাবলিক কীসমুহ"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "প্রকাশনা"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "বিজ্ঞান"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "জ্যোতির্বিদ্যা"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "জীববিজ্ঞান"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "রসায়ন"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "কম্পিউটার বিজ্ঞান"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "ভূবিজ্ঞানসমূহ"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "অঙ্কশাস্ত্র"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "পদার্থবিদ্যা"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "শেল"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "শব্দ"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "সিস্টেম"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "ভিত্তি"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "কনফিগারেশন"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Boot এবং Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "হার্ডওয়্যার"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "প্যাকেজ করা"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "প্রিন্ট করা"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "ডিপ্লয়মেন্ট"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "ডিপ্লয়মেন্ট"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "ফন্ট"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "কনসোল"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "ট্রু টাইপ"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 বিটম্যাপ"
 
 # sgstr "অন্তর-রাষ্ট্রিয়করণ"
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "আন্তর্জাতিকীকরণ"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "কার্নেল এবং হার্ডওয়্যার"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "লাইব্রেরি"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "সার্ভার"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "টার্মিন্যাল"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "টেক্সট সংক্রান্ত টুল"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "খেলনা"
 
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "ওয়ার্কষ্টেশন"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "কনসল টুল"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "ডকুমেন্টেশন"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "গেশ ষ্টেশন"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "ইন্টারনেট ষ্টেশন"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "মাল্টিমিডিয়া ষ্টেশন"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "নেটওয়ার্ক কম্পিউটার (ক্লাইন্ট)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "অফিস ওয়ার্কষ্টেশন"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "গ্রাফিকাল পরিবেশ"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "গুহনোম ওয়ার্কষ্টেশন"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "প্লাকার ডেস্কটপ"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE ওয়ার্কষ্টেশন"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "অন্যান্য গ্রাফিকাল ডেক্সটপ"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "সার্ভার"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "ডিএনএস/এনআইএস"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "ডেটাবেস"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "ফায়ারওয়াল/রাউটার"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "নেটওয়ার্ক কম্পিউটার সার্ভার"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "ওয়েব/FTP"
+
 # উপলব্ধ 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(নেই)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "অনুসন্ধানের ফলাফল"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "অনুসন্ধানের ফলাফল (শূন্য)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "অনুসন্ধান করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "যোগ করা সম্ভব"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "সফ্টওয়্যার মিডিয়া ম্যানেজার"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "থামো"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "আপগ্রেডযোগ্য"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "নির্বাচিত নয়"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "যোগ করা সম্ভব"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "নির্বাচিত"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "নির্বাচিত নয়"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "গুরুত্ত্ব: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "আপডেট করার কারন: "
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "নিরাপত্তা সংক্রান্ত আপডেট"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "বিবরণ নেই"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "ফাইল:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "পরিবর্তনলিপি:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "ফাইল:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "পরিবর্তনলিপি:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "মাধ্যম: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "বর্তমানে ইনস্টল করা ভার্সান: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "নাম: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "ভার্সান: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s কিলোবাইট"
-
 # মাপ
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "আকার: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s কিলোবাইট"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "সারাংশ: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "বিবরণ: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "সফ্টওয়্যার মিডিয়া ম্যানেজার"
-
 # অতিরিক্ত
 # বিস্তারিত
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "প্যাকেজ সমন্ধে আরো তথ্য..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "নিম্নোক্ত প্যাকেজগুলোর মধ্যে একটির প্রয়োজন আছে:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "অনুগ্রহ করে নির্বাচন করুন"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "নিম্নোক্ত প্যাকেজগুলোর মধ্যে একটির প্রয়োজন আছে:"
+msgstr[1] "নিম্নোক্ত প্যাকেজগুলোর মধ্যে একটির প্রয়োজন আছে:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "প্যাকেজের তালিকা তৈরি করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "কোন আপডেট নেই"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1185,36 +1528,43 @@ msgstr ""
 "আপনার কম্পিউটারে ইনস্টল করা প্যাকেজগুলোর জন্য কোন আপডেট\n"
 "উপস্থিত নেই অথবা আপনি ইতিমধ্যাই  আপডেটগুলোকে ইনস্টল করে নিয়েছেন।"
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 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:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "অতিরিক্ত তথ্য"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "প্যাকেজ সম্বন্ধিয় তথ্য"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "কিছু বাড়তি প্যাকেজ মুছে ফেলা প্রয়োজন"
 
 # যোগসুত্রের
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "ডিপেন্ডেনসির খাতিরে, নিম্নোক্ত প্যাকেজগুলোকেও মুছে ফেলতে  হবে:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "কিছু প্যাকেজ মুছে ফেলা সম্ভব নয়"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1223,7 +1573,8 @@ msgstr ""
 "\n"
 
 # ডিপেন্ডেনসির
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1233,11 +1584,13 @@ msgstr ""
 "এখনই বাদ দিতে হবে:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "অতিরিক্ত প্যাকেজের প্রয়োজন আছে"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1247,136 +1600,168 @@ msgstr ""
 "হবে:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (বাতিল তালিকায় উপস্হিত)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "কিছু প্যাকেজ ইনস্টল করা সম্ভব নয়"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "কিছু প্যাকেজ ইনস্টল করা সম্ভব নয়"
+msgstr[1] "কিছু প্যাকেজ ইনস্টল করা সম্ভব নয়"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"দুঃক্ষিত, নিম্নোক্ত প্যাকেজগুলো নির্বাচন করা যাবে না:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "দুঃক্ষিত, নিম্নোক্ত প্যাকেজগুলো নির্বাচন করা যাবে না:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "কিছু প্যাকেজ সরিয়ে ফেলতে হবে"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "নির্বাচিত: %s / ডিস্কে ফাঁকা জায়গা: %s"
 
 # মাপ
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "নির্বাচিত আকার: %d মেগাবাইট"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "এই প্যাকেজের বিস্তারিত বর্ণনা উপস্হিত নেই\n"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "একটি মারাত্মক ত্রুটি ঘটেছে: %s"
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "ইনস্টল করা"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "ইনস্টল করা"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s পছন্দ"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux এর পছন্দতালিকা"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "সকল প্যাকেজ, প্রথম অক্ষর অনুযায়ী"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "সকল প্যাকেজ, আপডেট অনুযায়ী"
 
 # মাপ
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "সকল প্যাকেজ, আকার অনুযায়ী"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "সকল প্যাকেজ, নির্বাচনের অবস্থা অনুযায়ী"
 
 # শুধুমাত্র পল্লব
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "শুধু Leaves, ইনস্টল তারিখের ক্রমে সাজানো"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "সকল প্যাকেজ, দল অনুযায়ী"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "সাধারণ আপ-ডেট"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "নিরাপত্তা সংক্রান্ত আপডেট"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "বাগফিক্সসমূহের (Bugfixes) আপডেট"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "সাধারণ আপ-ডেট"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "নিরাপত্তা সংক্রান্ত আপডেট"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "নামে"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "বিবরণে"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "ফাইলের নামে"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "সমস্যা: %s শুধুমাত্র পড়ার জন্য মাউন্ট করা মনে হচ্ছে।"
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "প্রথমে আপনাকে কিছু প্যাকেজ নির্বাচন করতে হবে।"
 
 # সীমা বহির্ভুত
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "অতিরিক্ত সংখ্যক প্যাকেজ নির্বাচন করা হয়েছে"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1392,133 +1777,171 @@ msgstr ""
 "\n"
 "সত্যিই কি আপনি বাছাই করা সব গুলো প্যাকেজ ইনস্টল করতে চান?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/ফাইল (_ফ)"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_মাধ্যম আপডেট"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_বাছাইকৃত কে পূর্বাবস্থায় ফেরাও"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/_প্যাকেজ সমুহের তালিকা পুনরায় লোড করো"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/প্রস্থান (_হ)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/অপশন (_অ)"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "সফ্টওয়্যার মিডিয়া ম্যানেজার"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_স্বয়ংক্রীয়ভাবে নির্বাচিত প্যাকেজগুলি দেখাও"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/সহায়িকা (_স)"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_বাগ রিপোর্ট করো"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_সম্বন্ধে..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "ম্যান্ড্রিব অনলাইন (Mandriva Online)"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Bangla team <mdk-translation@bengalinux.org>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "অনুসন্ধান:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "অনুসন্ধান"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "পরিষ্কার করো"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "সবকিছু নির্বাচন করো"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "প্রয়োগ"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "প্রস্থান"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "মারাত্মক ত্রুটি"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "একটি মারাত্মক ত্রুটি ঘটেছে: %s"
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "অনুগ্রহ করে অপেক্ষা করুন"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "প্যাকেজ ইনস্টলেশন প্রক্রিয়া..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "আরম্ভ করা হচ্ছে..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "ল্যান কনফিগারেশন"
+msgstr "কনফিগারেশন"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1530,12 +1953,13 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "আপডেট মাধ্যম বর্তমানে উপস্থিত আছে"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1551,12 +1975,13 @@ msgstr ""
 "\n"
 "এর পরে %s পুনরায় চালু করুন।"
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "আপনার মিরর কিভাবে স্বহস্তে নির্বাচন করবেন"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1570,57 +1995,75 @@ msgstr ""
 "\n"
 "এরপর %s পুনরায় চালু করুন।"
 
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "বিবরণে"
+
 # উপলব্ধ
-#: ../rpmdrake:1427
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "উপস্থিত প্যাকেজসমুহ খোঁজা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "প্যাকেজ সংক্রান্ত ডাটাবেসটি পড়া হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "প্যাকেজের তালিকা তৈরি করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
+
+# উপলব্ধ
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "উপস্থিত প্যাকেজসমুহ খোঁজা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "%s পরীক্ষা করা হচ্ছে"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "পরিবর্তন:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr ".%s মুছে ফেলো"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr ".%s কে মূল ফাইল হিসেবে ব্যবহার কর"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "কিছু করণীয় নেই"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "পরীক্ষা করা..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "অনুরোধ করা সব প্যাকেজ সফল্যের সাথে ইনস্টল করা হয়েছে।"
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "ইনস্টলেশনের সময় সমস্যা হয়েছে"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1631,17 +2074,18 @@ msgstr ""
 "%s"
 
 # উত্‍সর
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "সোর্স প্যাকেজ আহরণ করা সম্ভব হয়নি।"
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "দুঃক্ষিত, সোর্স প্যাকেজ আহরণ করা সম্ভব হয়নি। %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1653,67 +2097,83 @@ msgstr ""
 "ত্রুটি(সমুহ) নথিভুক্ত করা হয়েছে:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
+"%s\n"
+msgstr[1] ""
 "ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "একটি কী (key) মুছে ফেলুন"
+msgstr[1] "একটি কী (key) মুছে ফেলুন"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"অন্যান্য প্যাকেজ আপগ্রেড করতে হলে নিম্নোক্ত প্যাকেজগুলো মুছে ফেলা প্রয়োজন:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"অগ্রসর হওয়া যাবে কি?"
+msgstr[1] ""
 "অন্যান্য প্যাকেজ আপগ্রেড করতে হলে নিম্নোক্ত প্যাকেজগুলো মুছে ফেলা প্রয়োজন:\n"
 "\n"
 "%s\n"
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "আরম্ভ করা হচ্ছে..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "প্যাকেজ ইনস্টলেশন প্রক্রিয়া..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "অনুগ্রহ করে অপেক্ষা করুন"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "মাধ্যম পরিবর্তন করো"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "অনুগ্রহ করে \"%s\" নামক মাধ্যমটি [%s] ডিভাইসে  প্রবেশ করান"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) প্যাকেজ ডাউনলোড করা হচ্ছে..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "প্যাকেজের স্বাক্ষর পরীক্ষা করা হচ্ছে..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "নোটিশ"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1727,12 +2187,13 @@ msgstr ""
 "\n"
 "আপনি কি ইনস্টলেশন প্রক্রিয়া চালিয়ে যেতে ইচ্ছুক?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "ইনস্টলেশন বিফল হয়েছে"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1744,26 +2205,28 @@ msgstr ""
 "\n"
 "আপনি চাইলে আপনার মাধ্যমের ডাটাবেসটি আপডেট করতে পারেন।"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "প্যাকেজ ইনস্টলেশন প্রক্রিয়ার জন্য প্রস্তুতি নেওয়া হচ্ছে..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "প্রস্তুত করা হচ্ছে..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) প্যাকেজ ইনস্টল করা হচ্ছে..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm ফাইল [%s] ব্যবহার করা যাচ্ছে নাহ্"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1775,35 +2238,52 @@ msgstr ""
 "`.rpmnew' or `.rpmsave' নামক কিছু কনফিগারেশন ফাইল তৈরি হয়েছে,\n"
 "যা পরীক্ষা করে আপনি আপনার কার্যাবলী নির্ধারণ করতে পারেন;"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "সাধারণ তথ্য"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "এই প্যাকেজগুলোতে নতুন তথ্য আছে"
 
 # অতিরিক্ত
 # বিস্তারিত
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "প্যাকেজ সমন্ধে আরো তথ্য..."
+
+# অতিরিক্ত
+# বিস্তারিত
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "[%s] প্যাকেজ সমন্ধে আরো তথ্য..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "ত্রুটি"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "অসংশোধনযোগ্য ত্রুটি: দুঃক্ষিত, ইনস্টল করার জন্য কোন প্যাকেজ পাওয়া যায়নি।"
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "প্যাকেজ মুছে ফেলা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "মুছে ফেলার সময় সমস্যা"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1813,11 +2293,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "স্বাগতম"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1829,8 +2311,8 @@ msgstr ""
 "আপনার কম্পিউটারের যেসকল সফ্টওয়্যার আপনি মুছে ফেলতে ইচ্ছুক, তা আপনি\n"
 "এই টুলের সাহায্যে নির্বাচন করতে পারবেন।"
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1842,11 +2324,13 @@ msgstr ""
 "যে আপডেটগুলো আপনার কম্পিউটারে ইনস্টল করতে আপনি ইচ্ছুক, সেগুলোকে\n"
 "এই টুলের সাহায্যে নির্বাচন করতে পারবেন।"
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "সফ্টওয়্যার ইনস্টলেশন টুল এ স্বাগতম!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1860,173 +2344,213 @@ msgstr ""
 "বেশি সংখ্যক সফ্টওয়্যার উপস্থিত থাকে। যে সফ্টওয়্যারগুলো আপনার কম্পিউটারে\n"
 "ইনস্টল করতে আপনি ইচ্ছুক, সেগুলোকে এই টুলের দ্বারা নির্বাচন করতে পারবেন।"
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "সফটওয়্যার আপডেট"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "নীচে আপনার ইমেইল ঠিকানা প্রবেশ করুন"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "ব্যবহারকারীর নাম:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "সফটওয়্যার প্যাকেজ মুছে ফেলা"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "সফটওয়্যার প্যাকেজ আপডেট"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "সফ্টওয়্যার প্যাকেজ ইনস্টলেশন"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "না"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "হ্যাঁ"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "তথ্য..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "অস্ট্রিয়া"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "অস্ট্রেলিয়া"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "বেলজিয়াম"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "ব্রাজিল"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "কানাডা"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "সুইজারল্যান্ড"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "কস্টা রিকা"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "চেক প্রজাতন্ত্র"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "জার্মানি"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "ডেনমার্ক"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "গ্রীস"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "স্পেন"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "ফিনল্যান্ড"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "ফ্রাঁন্স"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "হাঙ্গেরী"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "ইজরায়েল"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "ইটালি"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "জাপান"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "কোরিয়া"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "নেদারল্যান্ড"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "নরওয়ে"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "পোল্যান্ড"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "পর্তুগাল"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "রাশিয়া"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "সুইডেন"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "সিঙ্গাপুর"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "স্লোভাকিয়া"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "তাইওয়ান"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "যুক্তরাজ্য"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "চীন"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "যুক্তরাষ্ট্র"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2038,7 +2562,8 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2050,28 +2575,30 @@ msgstr ""
 "\n"
 "অগ্রসর হওয়া যাবে কি?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s পছন্দ"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "মিররের ঠিকানা সমুহ ডাউনলোড করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন।"
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Mandriva-এর ওয়েবসাইট থেকে মিররের ঠিকানা ডাউনলোড করা হচ্ছে, অনুগ্রহ করে অপেক্ষা  "
 "করুন।"
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "ডাউনলোডের সময় সমস্যা হয়েছে"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2086,7 +2613,7 @@ msgstr ""
 "অনুগ্রহ করে কিছুক্ষণ পরে পুনরায় চেষ্টা করুন।"
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2101,14 +2628,17 @@ msgstr ""
 "অনুগ্রহ করে কিছুক্ষণ পরে পুনরায় চেষ্টা করুন।"
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "কোন মিরর নেই"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "আমি কোন মানানসই মিরর খুঁজে পাচ্ছি না।"
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2123,64 +2653,69 @@ msgstr ""
 "Updates -এর দ্বারা সমর্থন করে না।"
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "আকাঙ্ক্ষিত মিররটি নির্বাচন করুন।"
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' মাধ্যমের জন্য ফাইল কপি  করা হচ্ছে..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' মাধ্যমের জন্য ফাইল পরীক্ষা করা হচ্ছে..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' মাধ্যমের জন্য দূরবর্তী ফাইল পরীক্ষা করা হচ্ছে..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " সম্পন্ন।"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 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:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s, %s মাধ্যম থেকে"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' এর ডাউনলোড আরম্ভ করা হয়েছে..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s'-এর ডাউনলোড, অবশিষ্ট সময়:%s, গতি:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' এর ডাউনলোড, গতি: %s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "মাধ্যম আপডেট করা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "প্যাকেজ আহরণ করতে সমস্যা হয়েছে"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2196,29 +2731,29 @@ msgstr ""
 "যোগ করতে হবে। এটি সম্ভবত বর্তমানে উপস্হিত নয় এবং\n"
 "আপনাকে কিছুক্ষণ পরে আবার চেষ্টা করতে হবে।"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "মাধ্যম আপডেট করো"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "যে মাধ্যমটি আপনি আপ-ডেট করতে ইচ্ছুক তা নির্বাচন করুন:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "সবকিছু নির্বাচন করো"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "আপডেট"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2230,8 +2765,8 @@ msgstr ""
 "ত্রুটিসমুহ:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2241,16 +2776,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "মাধ্যম তৈরি করা যায়নি"
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "মাধ্যম যোগ করার প্রক্রিয়া বিফল হয়েছে"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2260,8 +2797,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2271,8 +2808,8 @@ msgstr ""
 "সাথে মিলছে নাহ্।\n"
 "একে নিষ্ক্রয় করা হবে।"
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2282,11 +2819,13 @@ msgstr ""
 "এর সাথে মিলছে নাহ্।\n"
 "একে নিষ্ক্রয় করা হবে।"
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "পটভূমিতে সহায়িকা আরম্ভ করা হয়েছে"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2564,21 +3103,22 @@ msgstr "সফ্টওয়্যার সরিয়ে ফেলো"
 msgid "Software Media Manager"
 msgstr "সফ্টওয়্যার মিডিয়া ম্যানেজার"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "প্যাকেজ সংক্রান্ত ডাটাবেসটি পড়া হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "ইনস্টল করার জন্য কোন প্যাকেজ পাওয়া যায়নি।"
 
-#~ msgid "Stop"
-#~ msgstr "থামো"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "সকল প্যাকেজ, অবস্থানের মাধ্যম অনুযায়ী"
 
-#~ msgid "Normal information"
-#~ msgstr "সাধারণ তথ্য"
-
 #~ msgid "Maximum information"
 #~ msgstr "সর্বাধিক তথ্য"
 
@@ -2600,9 +3140,6 @@ msgstr "সফ্টওয়্যার মিডিয়া ম্যানেজ
 #~ msgid "Keys"
 #~ msgstr "কী (key)"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/_প্রদর্শন"
 
diff --git a/po/bs.po b/po/bs.po
index 3e5499e0..d05b0cf8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-09-18 20:15+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -16,12 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Izaberite vrstu medija"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -46,16 +49,18 @@ msgstr ""
 "moraćete\n"
 "to raditi u dva koraka.)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Izvori distribucije"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Zvanične nadogradnje"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -73,84 +78,104 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Molim sačekajte, dodajem medije..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Dodaj medij"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Lokalne datoteke"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Put:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC server"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Put ili tačka montiranja:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Izmjenjivi uređaj"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Put ili tačka montiranja:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Potraži..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativni put do synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Ako ostavite prazno, synthesis/hdlist će biti automatski otkriven"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Napravi medij za čitavu distribuciju"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Potraži ažurirane pakete na ovom mediju"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Trebate popuniti najmanje prva dva polja."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -158,109 +183,132 @@ msgstr ""
 "Već postoji medij sa tim imenom, da li ga stvarno\n"
 "želite zamijeniti?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Dodajem medij:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Tip medija:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Globalne opcije za instalaciju paketa"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "uvijek"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "nikad"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Provjeri RPMove za instalaciju:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Download program:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Uklanjanje izvora"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-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:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Molim sačekajte, brišem medij..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Promijeni medij"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Izmjena medija \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Snimi izmjene"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Morate ubaciti medij u uređaj za nastavak"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Konfiguriši proxije"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Postavke proxy-ja za medij \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Globalne proxy postavke"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -268,138 +316,172 @@ msgstr ""
 "Ako vam je potreban proxy, ovdje unesite ime računara i eventualno port "
 "(sintaksa: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy ime računara:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Korisnik:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Dodaj paralelnu grupu"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Izmijeni paralelnu grupu"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Dodajem limit medija"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Izaberite medij za dodavanje ograničenja medija:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Dodaj računar"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Izmjena paralelne grupe \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Ime grupe:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Ograničenje medija:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Briši"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Računari:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Podesi paralelni urpmi (distribuirano izvršenje urpmi-ja)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grupa"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Ograničenje medija"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Ograničenje medija"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Naredba"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(nije instaliran)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Izmijeni..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Upravljaj ključevima za digitalne potpise paketa"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Medij"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Ključevi"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Dodaj ključ"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Izaberite ključ za dodavanje na medij %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Ukloni ključ"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -407,32 +489,38 @@ msgstr ""
 "Da li ste sigurni da želite obrisati ključ %s sa medija %s?\n"
 "(ime ključa: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Dodaj ključ..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Ukloni ključ"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Podesi medije"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Uključeno?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Ažurirani paketi?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Ovaj medij treba ažurirati prije upotrebe. Želite li to uraditi sada?"
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -442,32 +530,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Dodaj vlastiti..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Unaprijedi..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Upravljaj ključevima..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paralelno..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Globalne postavke..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -477,7 +571,8 @@ msgstr ""
 "\n"
 "Želite li da nastavim?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -491,7 +586,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -502,12 +598,13 @@ 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:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Ne mogu dodati medij, pogrešni ili nepostojeći argumenti"
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -517,8 +614,8 @@ msgstr ""
 "Ovo znači da ćete moći dodati na vaš sistem nove softverske\n"
 "pakete sa tih medija."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -528,22 +625,23 @@ msgstr ""
 "Ovo znači da ćete moći dodati na vaš sistem nove softverske\n"
 "pakete sa tog medija."
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Uspješno dodan medij %s."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Uspješno dodan medij `%s'."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -551,36 +649,43 @@ msgstr ""
 "  --changelog-first      prikaži changelog prije liste datoteka u opisnom "
 "prozoru"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     ograniči na date medije"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     predloži spajanje svih pronađenih .rpmnew/.rpmsave "
 "datoteka"
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            izaberi režim (install (default), remove, update)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      ne pitaj za potvrdu u update režimu"
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      ne ažuriraj medije prilikom pokretanja"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        ne provjeravaj potpise paketa"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -588,27 +693,33 @@ msgstr ""
 "  --parallel=alias,host  uđi u paralelni režim, koristi grupu \"alias\", "
 "koristi računar \"host\" za potrebne deps"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    prikaži samo ove pakete"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      pred-izaberi ove pakete"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 prisili izvršenje kao root"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           izvrši pretragu za \"pkg\""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Radim u korisničkom modu"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -618,545 +729,786 @@ msgstr ""
 "Nećete moći vršiti izmjene na sistemu, ali i dalje možete\n"
 "pregledati postojeću bazu podataka."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Pristupačnost"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arhiviranje"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD prženje"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Kompresija"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Ostalo"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Knjige"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Računarske knjige"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "FAQovi"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howto-ovi"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Književnost"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Prosljeđivanje poruka"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Queueing usluge"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Komunikacije"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Baze podataka"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Programiranje"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME i GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE i Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editori"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Obrazovanje"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Simulatori"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Alati za datoteke"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Igre"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Avanture"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkadne igre"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Tabla"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Karte"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Zagonetke"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategija"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Grafički desktop"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM baziran"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Nadzor"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedija"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Mreža"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Prijenos podataka"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Instant poruke"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "E-mail"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Udaljeni pristup"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Ured"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Javni ključevi"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Izdavaštvo"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Nauke"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomija"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Hemija"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Računarske nauke"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geonauke"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistem"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Osnovno"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Pokretanje i inicijalizacija"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pakiranje"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Štampanje"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Deploiement"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Deploiement"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Fontovi"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konzola"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmapa"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internacionalizacija"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel i hardware"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Biblioteke"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Serveri"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Tekst alati"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Igračke"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Radna stanica"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Alati za konzolu"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Stanica za igru"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Internet stanica"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimedijalna stanica"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Mrežni računar (klijent)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Uredska radna stanica"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Grafičko okruženje"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME radna stanica"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "IceWm okruženje"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE radna stanica"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Ostale grafičke okoline"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Server"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Baze podataka"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Mrežni server"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Nijedan nije dostupan)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Rezultati pretrage"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Rezultati pretrage (ništa)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Molim sačekajte, tražim..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Može se dodati"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Upravljanje softverom"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr ""
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Može se unaprijediti"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Nije izabrano"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Može se dodati"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Izabrano"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Nije izabrano"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Značaj: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Razlog za update: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Opis sigurnosnog problema"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Bez opisa"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Datoteke:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Changelog:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Datoteke:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Medij: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Trenutno instalirana verzija: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Verzija: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Arhitektura: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Veličina: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Sažetak: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Upravljanje softverom"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Više informacija o paketu..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Potreban je jedan od sljedećih paketa:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Molim izaberite"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Potreban je jedan od sljedećih paketa:"
+msgstr[1] "Potreban je jedan od sljedećih paketa:"
+msgstr[2] "Potreban je jedan od sljedećih paketa:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Molim sačekajte, listam pakete..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Nema update-a"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1166,24 +1518,29 @@ msgstr ""
 "za pakete koji su instalirani na vašem računaru, ili da ste ih\n"
 "već instalirali."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Sve"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Više informacija"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informacije o paketima"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Potrebno je obrisati neke dodatne pakete"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1191,11 +1548,13 @@ msgstr ""
 "Da bismo zadovoljili sve zavisnosti, sljedeće pakete takođe treba "
 "deinstalirati:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Neke pakete se ne može deinstalirati"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1203,7 +1562,8 @@ msgstr ""
 "Uklanjanje ovog paketa bi izazvalo rušenje sistema:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1213,11 +1573,13 @@ msgstr ""
 "izbaciti sa liste izabranih:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Potrebni su dodatni paketi"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1227,129 +1589,169 @@ msgstr ""
 "instalirati:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (pripada listi za preskakanje)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Neki paketi se ne mogu instalirati"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Neki paketi se ne mogu instalirati"
+msgstr[1] "Neki paketi se ne mogu instalirati"
+msgstr[2] "Neki paketi se ne mogu instalirati"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Žalim, sljedeće pakete ne možete izabrati:\n"
+"\n"
+"%s"
+msgstr[1] ""
+"Žalim, sljedeće pakete ne možete izabrati:\n"
+"\n"
+"%s"
+msgstr[2] ""
 "Žalim, sljedeće pakete ne možete izabrati:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Neke pakete treba obrisati"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Izabrano: %s / Slobodan prostor: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Veličina izabranog: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Opis nije dostupan za ovaj paket\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Došlo je do fatalne greške: %s"
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Instaliran"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Nije instaliran"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s izbori"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux izbori"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Svi paketi, abecedno"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Svi paketi, po dostupnosti update-a"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Svi paketi, po veličini"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Svi paketi, po stanju izabranosti"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Samo listovi, sortirani po datumu instalacije"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Svi paketi, po grupi"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Svi updati"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Sigurnosna unaprjeđenja"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Ispravke bugova"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Normalni update-i"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Sigurnosna unaprjeđenja"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "u imenima"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "u opisima"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "u imenima datoteka"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Greška: izgleda da je %s montiran samo za čitanje."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Trebate najprije izabrati neke pakete."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Izabrano je previše paketa"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1365,132 +1767,174 @@ msgstr ""
 "\n"
 "Želite li stvarno instalirati sve izabrane pakete?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Osvježi medije"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Poništi izbor"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Ponovo učitaj _listu paketa"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Izlaz"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/Op_cije"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Podesite medije"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Automatski prikaži izabrane pakete"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/Po_moć"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Prijavi grešku"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_O programu..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "O programu Rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autorska prava (C) %s Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake je Mandriva Linux alat za upravljanje paketima."
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Vedran Ljubović <vljubovic@smartnet.ba>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Pronađi:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Pretraga"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Očisti"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Izaberi sve"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Primjeni"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Brzi uvod"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "Možete pretražiti pakete koristeći stablo kategorija sa lijeve strane."
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Možete pregledati informacije o paketu klikom na njegovo ime na spisku desno."
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "Da biste instalirali, ažurirali ili uklonili paket, samo kliknite na \"kocku"
 "\" pored njegovog imena."
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Fatalna greška"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Došlo je do fatalne greške: %s"
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Molim sačekajte"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Instalacija paketa..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Inicijaliziram..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Potvrda"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1502,12 +1946,13 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Već postojeći update medij"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1522,12 +1967,13 @@ msgstr ""
 "\n"
 "Zatim, restartujte %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kako da ručno izaberete vaš mirror"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1541,56 +1987,73 @@ msgstr ""
 "\n"
 "Onda restartujte %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "u opisima"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Molim sačekajte, tražim dostupne pakete..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Molim sačekajte, čitam bazu paketa..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Molim sačekajte, listam pakete..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Molim sačekajte, tražim dostupne pakete..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Ispitujem %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "izmjene:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Ukloni .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Koristi .%s kao glavnu datoteku"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Nemoj raditi ništa"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Instalacija završena"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Ispitaj..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Svi traženi paketi su uspješno instalirani."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Problem prilikom instalacije"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1600,17 +2063,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Ne mogu da dobavim izvorne pakete."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ne mogu da dobavim izvorne pakete, žalim. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1621,67 +2085,93 @@ msgstr ""
 "\n"
 "Prijavljene greške:%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Da bih zadovoljio ovisnosti, instaliraću sljedećih %d paketa:\n"
+"%s\n"
+msgstr[1] ""
+"Da bih zadovoljio ovisnosti, instaliraću sljedećih %d paketa:\n"
+"%s\n"
+msgstr[2] ""
 "Da bih zadovoljio ovisnosti, instaliraću sljedećih %d paketa:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Ukloni ključ"
+msgstr[1] "Ukloni ključ"
+msgstr[2] "Ukloni ključ"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Sljedeći paketi trebaju biti uklonjeni kako bi ostali bili unaprijeđeni:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Mogu li nastaviti?"
+msgstr[1] ""
+"Sljedeći paketi trebaju biti uklonjeni kako bi ostali bili unaprijeđeni:\n"
+"\n"
+"%s\n"
+"\n"
+"Mogu li nastaviti?"
+msgstr[2] ""
 "Sljedeći paketi trebaju biti uklonjeni kako bi ostali bili unaprijeđeni:\n"
 "\n"
 "%s\n"
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Inicijaliziram..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Instalacija paketa..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Molim sačekajte"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Želite li da nastavim?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Promijeni medij"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim ubacite medij pod imenom \"%s\" u uređaj [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Downloadujem paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Provjeravam potpise paketa..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1695,12 +2185,13 @@ msgstr ""
 "\n"
 "Želite li nastaviti instalaciju?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1712,25 +2203,28 @@ msgstr ""
 "\n"
 "Vjerovatno trebate update-ovati vašu bazu medija."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Pripremam instalaciju paketa..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti RPM datoteci [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1743,33 +2237,48 @@ msgstr ""
 "rpmsave',\n"
 "sada ih možete ispitati kako biste preduzeli neke akcije:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Ovi paketi dolaze sa informacijama o unaprjeđenju"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Više informacija o paketu..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Više informacija o paketu... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Greška"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Nepopravljiva greška: nije pronađen paket za instalaciju, žalim."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Molim sačekajte, uklanjam pakete..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Problem prilikom uklanjanja"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1779,11 +2288,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Dobro došli"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1795,8 +2306,8 @@ msgstr ""
 "Ovaj alat će vam pomoći da izaberete koji softver želite ukloniti sa vašeg\n"
 "računara."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1808,11 +2319,13 @@ msgstr ""
 "Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
 "vaš računar."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Dobro došli u alat za instalaciju programa!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1826,172 +2339,213 @@ 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:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Ažuriranje programa"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Molim unesite vaše podatke radi pristupa proxy serveru\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Korisničko ime:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Uklanjanje softverskih paketa"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Ažuriranje softverskih paketa"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Instalacija softverskih paketa"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australija"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Švicarska"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Njemačka"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danska"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grčka"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Španija"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finska"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Francuska"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Mađarska"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italija"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovačka"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "SAD"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2003,7 +2557,8 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2015,25 +2570,28 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Izbor mirrora"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Molim sačekajte, skidam adrese mirrora."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Molim sačekajte, skidam adrese mirrora sa Mandriva web stranice."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Greška prilikom downloada"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2048,7 +2606,7 @@ msgstr ""
 "Molim probajte ponovo kasnije."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2063,14 +2621,17 @@ msgstr ""
 "Molim probajte ponovo kasnije."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Nema mirrora"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Ne mogu pronaći nijedan pogodan mirror."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2085,63 +2646,68 @@ msgstr ""
 "oficijelnih update-a."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Molimo izaberite željeni mirror"
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiram datoteku za medij '%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Ispitujem datoteku medija '%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ispitujem udaljenu datoteku medija '%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " završeno."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " nije uspjelo!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s sa medija %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Započinjem download '%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download '%s', preostalo:%s, brzina:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download '%s', brzina:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Molim sačekajte, osvježavam medije..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Greška pri dobavljanju paketa"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2156,31 +2722,31 @@ msgstr ""
 "biste ga rekonfigurisali; ili je medij trenutno nedostupan i trebate\n"
 "pokušati ponovo kasnije."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Osvježi medij"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Nijedan medij nije aktivan. Morate aktivirati neke medije prije nego što ih "
 "ažurirate."
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Izaberite medije koje želite unaprijediti:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Izaberi sve"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Update"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2192,8 +2758,8 @@ msgstr ""
 "Greške:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2203,16 +2769,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Ne mogu kreirati medij."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Neuspjeh u dodavanju medija"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2222,8 +2790,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2233,8 +2801,8 @@ msgstr ""
 "(%s).\n"
 "Medij će biti isključen."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2244,11 +2812,13 @@ msgstr ""
 "trenutno koristite (%s).\n"
 "Medij će biti isključen."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Pomoć je pokrenuta u pozadini"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2523,3 +3093,6 @@ msgstr "Ukloni softver"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Upravitelj medijima softvera"
+
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Molim sačekajte, čitam bazu paketa..."
diff --git a/po/ca.po b/po/ca.po
index bb26a38c..15f5fa1a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 09:56+0100\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +19,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Escolliu el tipus de font"
 
 #: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -49,15 +52,17 @@ msgstr ""
 "ho haureu de fer en dos passos.)"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Fonts de la distribució"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Actualitzacions oficials"
 
 #: ../edit-urpm-sources.pl:97
-#, perl-format
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -76,86 +81,104 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#. because updates media do not provide media.cfg yet
 #: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Si us plau espereu, s'estan afegint fonts..."
 
 #: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Afegeix una font"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Fitxers locals"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Camí:"
 
 #: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Servidor FTP"
 
 #: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:416
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
 #: ../edit-urpm-sources.pl:148
-#, fuzzy
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "Servidor FTP"
 
 #: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Servidor HTTP"
 
 #: ../edit-urpm-sources.pl:150
-msgid "Path or mount point:"
-msgstr "Camí o punt de muntatge:"
-
-#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Dispositiu extraïble"
 
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Camí o punt de muntatge:"
+
 #: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Navega..."
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Entrada:"
 
-#: ../edit-urpm-sources.pl:197 ../edit-urpm-sources.pl:501 ../rpmdrake.pm:131
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../edit-urpm-sources.pl:202 ../edit-urpm-sources.pl:417
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Camí relatiu a synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:209
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../edit-urpm-sources.pl:217
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Crea suport per a una distribució completa"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Cerca actualitzacions en aquesta font"
 
-#: ../edit-urpm-sources.pl:238
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Es necessita que ompliu les dues primeres entrades."
 
-#: ../edit-urpm-sources.pl:242
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -163,113 +186,132 @@ msgstr ""
 "Ja hi ha una font amb aquest nom, realment\n"
 "voleu reemplaçar-la?"
 
-#: ../edit-urpm-sources.pl:253
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Afegint una font:"
 
-#: ../edit-urpm-sources.pl:255
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Tipus de font:"
 
-#: ../edit-urpm-sources.pl:263 ../edit-urpm-sources.pl:338
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:453
-#: ../edit-urpm-sources.pl:518 ../edit-urpm-sources.pl:600
-#: ../edit-urpm-sources.pl:640 ../edit-urpm-sources.pl:698
-#: ../edit-urpm-sources.pl:837 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:1921 ../rpmdrake:1929 ../rpmdrake.pm:287 ../rpmdrake.pm:596
-#: ../rpmdrake.pm:681 ../rpmdrake.pm:754
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../edit-urpm-sources.pl:265 ../edit-urpm-sources.pl:340
-#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:508
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:639
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:763
-#: ../edit-urpm-sources.pl:830 ../edit-urpm-sources.pl:883
-#: ../edit-urpm-sources.pl:1032 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:977 ../rpmdrake:982 ../rpmdrake:1827 ../rpmdrake:1921
-#: ../rpmdrake:2068 ../rpmdrake.pm:122 ../rpmdrake.pm:227 ../rpmdrake.pm:289
-#: ../rpmdrake.pm:596
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Opcions globals per a la instal·lació de paquets"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "sempre"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "mai"
 
-#: ../edit-urpm-sources.pl:334
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifica els RPMs a instal·lar:"
 
-#: ../edit-urpm-sources.pl:335
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Programa de descàrrega a usar:"
 
-#: ../edit-urpm-sources.pl:365
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Eliminació de fonts"
 
-#: ../edit-urpm-sources.pl:366
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Esteu segur de voler eliminar la font \"%s\"?"
 
-#: ../edit-urpm-sources.pl:371
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Si us plau espereu, s'està eliminant la font..."
 
-#: ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Edita una font"
 
-#: ../edit-urpm-sources.pl:413
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Editant la font \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
 msgid "Downloader:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:430
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Desa canvis"
 
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:1019
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Intermediari..."
 
-#: ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Heu d'inserir la font per a continuar"
 
-#: ../edit-urpm-sources.pl:452
+#: ../edit-urpm-sources.pl:450
+#, 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:473
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Configureu els servidors intermediaris"
 
-#: ../edit-urpm-sources.pl:484
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Configuració de l'intermediari per a la font \"%s\""
 
-#: ../edit-urpm-sources.pl:485
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Opcions globals de l'intermediari"
 
-#: ../edit-urpm-sources.pl:487
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -277,145 +319,175 @@ msgstr ""
 "Si necessiteu un servidor intermediari, entreu el nom de l'ordinador "
 "servidor i un port opcional (sintaxi: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:490
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Nom del servidor intermediari:"
 
-#: ../edit-urpm-sources.pl:493
+#: ../edit-urpm-sources.pl:491
+#, 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:496
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Usuari:"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Afegeix un grup paral·lel"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Edita un grup paral·lel "
 
-#: ../edit-urpm-sources.pl:579
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Afegeix un límit de font"
 
-#: ../edit-urpm-sources.pl:591
+#: ../edit-urpm-sources.pl:589
+#, 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:628
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Afegeix un ordinador"
 
-#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:632
+#, 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:665
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editant el grup paral·lel \"%s\":"
 
-#: ../edit-urpm-sources.pl:669
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../edit-urpm-sources.pl:672
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Límit de font:"
 
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Afegeix"
 
-#: ../edit-urpm-sources.pl:678 ../edit-urpm-sources.pl:685
-#: ../edit-urpm-sources.pl:743 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: ../edit-urpm-sources.pl:679
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Ordinadors Centrals:"
 
-#: ../edit-urpm-sources.pl:713
+#: ../edit-urpm-sources.pl:711
+#, 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:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grup"
 
-#: ../edit-urpm-sources.pl:716
-msgid "Media limit"
-msgstr "Límit de fonts"
-
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../edit-urpm-sources.pl:717
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Límit de fonts"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Ordre"
 
-#: ../edit-urpm-sources.pl:727 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:886 ../rpmdrake:1748
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(cap)"
 
-#: ../edit-urpm-sources.pl:747 ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Edita..."
 
-#: ../edit-urpm-sources.pl:755 ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Afegeix..."
 
-#: ../edit-urpm-sources.pl:771
+#: ../edit-urpm-sources.pl:769
+#, 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:775 ../edit-urpm-sources.pl:932
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Font"
 
 #: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Claus"
 
-#: ../edit-urpm-sources.pl:799
+#: ../edit-urpm-sources.pl:803
+#, 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:812
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Afegeix una clau"
 
-#: ../edit-urpm-sources.pl:824
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:833
+#: ../edit-urpm-sources.pl:834
+#, c-format
 msgid "Close"
 msgstr "Tanca"
 
-#: ../edit-urpm-sources.pl:855
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Elimina una clau"
 
-#: ../edit-urpm-sources.pl:853
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -423,34 +495,40 @@ msgstr ""
 "Esteu segur de voler eliminar la clau %s de la font %s?\n"
 "(nom de la clau: %s)"
 
-#: ../edit-urpm-sources.pl:871
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Afegeix una clau..."
 
-#: ../edit-urpm-sources.pl:875
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Suprimeix la clau"
 
-#: ../edit-urpm-sources.pl:891
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Configura les fonts "
 
-#: ../edit-urpm-sources.pl:930
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Habilitat?"
 
-#: ../edit-urpm-sources.pl:931
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Actualitzacions?"
 
-#: ../edit-urpm-sources.pl:947
+#: ../edit-urpm-sources.pl:951
+#, c-format
 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:977
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -460,32 +538,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1011
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Afegeix personalitzat..."
 
-#: ../edit-urpm-sources.pl:1015
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Actualització..."
 
-#: ../edit-urpm-sources.pl:1018
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Administra les claus..."
 
-#: ../edit-urpm-sources.pl:1020
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paral·lel..."
 
-#: ../edit-urpm-sources.pl:1021
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Opcions globals..."
 
-#: ../edit-urpm-sources.pl:1031 ../rpmdrake:1428
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../edit-urpm-sources.pl:1047 ../gurpmi.addmedia:98 ../rpmdrake:2144
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -495,7 +579,8 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../edit-urpm-sources.pl:1050
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -511,7 +596,8 @@ msgstr ""
 "programari \n"
 "o que es facin actualitzacions del sistema."
 
-#: ../edit-urpm-sources.pl:1063
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -524,11 +610,12 @@ msgstr ""
 "algun paquet?)."
 
 #: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "No s'ha pogut afegir la font, arguments incorrectes o insuficients"
 
 #: ../gurpmi.addmedia:102
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -539,7 +626,7 @@ msgstr ""
 "al vostre sistema des d'aquesta font."
 
 #: ../gurpmi.addmedia:105
-#, perl-format
+#, c-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"
@@ -550,21 +637,22 @@ msgstr ""
 "al vostre sistema des d'aquesta font."
 
 #: ../gurpmi.addmedia:130
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "S'ha afegit la font `%s' amb èxit."
 
 #: ../gurpmi.addmedia:131
-#, perl-format
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "S'ha afegit la font `%s' amb èxit."
 
 #: ../rpmdrake:39
-#, perl-format
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Sintaxi: %s [OPCIÓ]..."
 
 #: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -573,35 +661,42 @@ msgstr ""
 "d'arxius en la finestra de descripció"
 
 #: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     es limita a la font triada"
 
 #: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     proposa combinar tots els .rpmnew/.rpmsave trobats"
 
 #: ../rpmdrake:43
+#, c-format
 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:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      no demanis confirmació en mode actualització"
 
 #: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      no actualitzis les fonts al principi"
 
 #: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        no verifiquis les signatures dels paquets"
 
 #: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -610,26 +705,32 @@ msgstr ""
 "màquina \"host\" per mostrar les dependències"
 
 #: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    mostra només aquets paquets"
 
 #: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      preselecciona aquests paquets"
 
 #: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 força l'execució com a root"
 
 #: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           inicia recerca de \"pkg\""
 
 #: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Funcionant en mode usuari"
 
 #: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -640,70 +741,86 @@ msgstr ""
 "però podrà examinar la base de dades existent."
 
 #: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Accessibilitat"
 
 #: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
 #: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arxivant"
 
 #: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Resguard"
 
 #: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Creació de Cds"
 
 #: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Compressió"
 
 #: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
 #: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
 #: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Altres"
 
 #: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
 #: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Llibres"
 
 #: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Llibres d'informàtica "
 
 #: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Preguntes més freqüents"
 
 #: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Com es fa...?"
 
 #: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Literatura"
 
 #: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
 #: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Pas de missatges"
 
 #: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Serveis de cues"
 
 #: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Comunicacions"
 
 #: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Bases de dades"
 
@@ -711,245 +828,302 @@ msgstr "Bases de dades"
 #: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
 #: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Desenvolupament"
 
 #: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
 #: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
 #: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "Gnome i GTK+"
 
 #: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
 #: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE i QT"
 
 #: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Nucli"
 
 #: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
 #: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
 #: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
 #: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editors"
 
 #: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Educació"
 
 #: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emuladors"
 
 #: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Eines de fitxer"
 
 #: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
 #: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
 #: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Jocs"
 
 #: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Aventura"
 
 #: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
 #: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Taulers"
 
 #: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Cartes"
 
 #: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Trencaclosques"
 
 #: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Esports"
 
 #: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Estratègia"
 
 #: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
 #: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
 #: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Escriptori gràfic"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "Basat en FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
 #: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Gràfics"
 
 #: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Monitorització"
 
 #: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimèdia"
 
 #: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Vídeo"
 
 #: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
 #: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
 #: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Xarxa"
 
 #: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Xat"
 
 #: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Transferència de fitxers "
 
 #: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
 #: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Missatgeria instantània"
 
 #: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Correu electrònic "
 
 #: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Notícies"
 
 #: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Accés remot"
 
 #: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
 #: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Ofimàtica"
 
 #: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Claus públiques"
 
 #: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publicació"
 
 #: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
 #: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
 #: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Ciències"
 
 #: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
 #: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologia"
 
 #: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Química"
 
 #: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Ciències de la computació"
 
 #: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geociències"
 
 #: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matemàtiques"
 
 #: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Física"
 
 #: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Intèrprets d'ordres"
 
 #: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "So"
 
@@ -959,326 +1133,392 @@ msgstr "So"
 #: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
 #: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
 #: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistema"
 
 #: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Base"
 
 #: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
 #: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Configuració"
 
 #: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Arrencada i Inici"
 
 #: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Maquinari "
 
 #: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Empaquetat"
 
 #: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Imprimint"
 
 #: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Desplegament"
 
 #: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Desplegament"
 
 #: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
 #: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Fonts"
 
 #: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Consola"
 
 #: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
 #: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
 #: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "Mapa de bits X11"
 
 #: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internacionalització"
 
 #: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Nucli i maquinari"
 
 #: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Biblioteques"
 
 #: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Servidors"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
 #: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminals"
 
 #: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Eines de text"
 
 #: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Joguines"
 
-#. for Mandriva Choice:
 #: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
 #: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
 #: ../rpmdrake:345 ../rpmdrake:346
-#, fuzzy
+#, c-format
 msgid "Workstation"
-msgstr "Configuració de la LAN"
+msgstr "Estació de treball"
 
 #: ../rpmdrake:339
-#, fuzzy
+#, c-format
 msgid "Console Tools"
-msgstr "Consola"
+msgstr "Eines de consola"
 
 #: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
 msgid "Documentation"
-msgstr ""
+msgstr "Documentació"
 
 #: ../rpmdrake:341
+#, c-format
 msgid "Game station"
-msgstr ""
+msgstr "Estació de jocs"
 
 #: ../rpmdrake:342
-#, fuzzy
+#, c-format
 msgid "Internet station"
-msgstr "Internacionalització"
+msgstr "Estació d'Internet"
 
 #: ../rpmdrake:343
-#, fuzzy
+#, c-format
 msgid "Multimedia station"
-msgstr "Multimèdia"
+msgstr "Estació multimèdia"
 
 #: ../rpmdrake:344
-#, fuzzy
+#, c-format
 msgid "Network Computer (client)"
-msgstr "Ciències de la computació"
+msgstr "Ordinador de xarxa (client)"
 
 #: ../rpmdrake:345
+#, c-format
 msgid "Office Workstation"
-msgstr ""
+msgstr "Estació de treball d'oficina"
 
 #: ../rpmdrake:346
+#, c-format
 msgid "Scientific Workstation"
 msgstr "Estació de treball científica"
 
 #: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Graphical Environment"
-msgstr "Escriptori gràfic"
+msgstr "Entorn gràfic"
 
 #: ../rpmdrake:349
+#, c-format
 msgid "GNOME Workstation"
-msgstr ""
+msgstr "Estació de treball GNOME"
 
 #: ../rpmdrake:350
+#, c-format
 msgid "IceWm Desktop"
-msgstr ""
+msgstr "Escriptori IceWm"
 
 #: ../rpmdrake:351
+#, c-format
 msgid "KDE Workstation"
-msgstr ""
+msgstr "Estació de treball KDE"
 
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Other Graphical Desktops"
-msgstr "Escriptori gràfic"
+msgstr "Altres escriptoris gràfics"
 
 #: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
 #: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
 msgid "Server"
 msgstr "Servidor"
 
 #: ../rpmdrake:357
+#, c-format
 msgid "DNS/NIS"
-msgstr ""
+msgstr "DNS/NIS"
 
 #: ../rpmdrake:358
-#, fuzzy
+#, c-format
 msgid "Database"
-msgstr "Bases de dades"
+msgstr "Base de dades"
 
 #: ../rpmdrake:359
+#, c-format
 msgid "Firewall/Router"
-msgstr ""
+msgstr "Tallafoc/Encaminador"
 
 #: ../rpmdrake:361
+#, c-format
 msgid "Mail/Groupware/News"
 msgstr ""
 
 #: ../rpmdrake:362
-#, fuzzy
+#, c-format
 msgid "Network Computer server"
-msgstr "Ciències de la computació"
+msgstr "Servidor d'ordinador de xarxa"
 
 #: ../rpmdrake:363
+#, c-format
 msgid "Web/FTP"
-msgstr ""
+msgstr "Web/FTP"
 
-#. - to highlight information
-#: ../rpmdrake:502 ../rpmdrake:707 ../rpmdrake:712 ../rpmdrake:726
-#: ../rpmdrake:728
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(No disponible)"
 
-#: ../rpmdrake:534
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Resultats de la cerca"
 
 #: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Resultats de la cerca (cap)"
 
-#: ../rpmdrake:545 ../rpmdrake:2125
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Si us plau espereu, s'està buscant..."
 
-#: ../rpmdrake:617 ../rpmdrake:921
-msgid "Addable"
-msgstr "Afegible"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Gestor de Fonts de Programari"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Para"
 
-#: ../rpmdrake:617 ../rpmdrake:921
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Actualitzable"
 
-#: ../rpmdrake:619
-msgid "Not selected"
-msgstr "No seleccionat"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Afegible"
 
 #: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Seleccionat"
 
-#. is it an update?
-#: ../rpmdrake:687 ../rpmdrake:744
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "No seleccionat"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Importància: "
 
-#: ../rpmdrake:688 ../rpmdrake:752
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Raó d'actualització: "
 
-#: ../rpmdrake:692
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Actualitzacions de seguretat"
 
-#: ../rpmdrake:700 ../rpmdrake:754
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Cap descripció"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Fitxers:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Canvis:"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Fitxers:\n"
 
-#: ../rpmdrake:728
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Canvis:\n"
 
-#: ../rpmdrake:733 ../rpmdrake.pm:807
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Font:"
 
-#: ../rpmdrake:734
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Versió actualment instal·lada: "
 
-#: ../rpmdrake:738
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Nom: "
 
-#: ../rpmdrake:739
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versió: "
 
-#: ../rpmdrake:740
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Arquitectura: "
 
-#: ../rpmdrake:741
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:741
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Mida: "
 
-#. extra empty line
-#: ../rpmdrake:748
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Resum: "
 
-#: ../rpmdrake:754
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Descripció: "
 
-#: ../rpmdrake:810 ../rpmdrake.pm:179
-#, fuzzy
-msgid "Software Management"
-msgstr "Gestor de Fonts de Programari"
-
-#: ../rpmdrake:827 ../rpmdrake:973 ../rpmdrake:975
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Més informació del paquet..."
 
-#: ../rpmdrake:829
-msgid "One of the following packages is needed:"
-msgstr "Es necessita un dels següents paquets:"
-
-#: ../rpmdrake:829
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Si us plau escolliu"
 
-#: ../rpmdrake:870
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Es necessita un dels següents paquets:"
+msgstr[1] "Es necessita un dels següents paquets:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Si us plau espereu, llistant els paquets..."
 
-#: ../rpmdrake:888
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "No hi ha actualitzacions"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1289,24 +1529,29 @@ msgstr ""
 "ordinador,\n"
 "o que ja els heu instal·lat tots."
 
-#: ../rpmdrake:912 ../rpmdrake:1174
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Tot"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:960 ../rpmdrake:965
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Més informació"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informació dels paquets"
 
-#: ../rpmdrake:991
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Cal esborrar alguns paquets addicionals"
 
-#: ../rpmdrake:992
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1314,11 +1559,13 @@ msgstr ""
 "Degut a les seves dependències, els següents paquets també necessiten ser "
 "esborrats:"
 
-#: ../rpmdrake:998 ../rpmdrake:1007
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Alguns paquets no poden ser esborrats"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1326,7 +1573,8 @@ msgstr ""
 "Suprimir aquests paquets faria mal bé el sistema, disculpau:\n"
 "\n"
 
-#: ../rpmdrake:1008 ../rpmdrake:1073
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1336,11 +1584,13 @@ msgstr ""
 "deseleccionar:\n"
 "\n"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Es necessiten paquets addicionals"
 
-#: ../rpmdrake:1038
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1350,137 +1600,164 @@ msgstr ""
 "paquet(s):\n"
 "\n"
 
-#: ../rpmdrake:1053
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (pertany a la llista d'omesos)"
 
-#: ../rpmdrake:1056
-msgid "Some packages can't be installed"
-msgstr "Alguns paquets no poder ser instal·lats"
-
-#: ../rpmdrake:1057
-#, perl-format
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Alguns paquets no poder ser instal·lats"
+msgstr[1] "Alguns paquets no poder ser instal·lats"
+
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Ho sento, no es poden seleccionar els següents paquets:\n"
+"\n"
+"%s "
+msgstr[1] ""
 "Ho sento, no es poden seleccionar els següents paquets:\n"
 "\n"
 "%s "
 
-#: ../rpmdrake:1072 ../rpmdrake:1896
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "S'han d'eliminar alguns paquets"
 
-#: ../rpmdrake:1101
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Seleccionats: %s / Espai lliure en el disc: %s"
 
-#: ../rpmdrake:1102
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Espai seleccionat %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:1107
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "La descripció d'aquest paquet no està disponible\n"
 
-#: ../rpmdrake:1113 ../rpmdrake:1506
-#, perl-format
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Hi ha hagut un error fatal %s. "
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Instal·la"
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Instal·la"
 
-#: ../rpmdrake:1175
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "Seleccions de %s"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Seleccions de Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1177
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Tots els paquets, alfabèticament"
 
-#: ../rpmdrake:1178
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Tots els paquets, amb actualització."
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Tots els paquets, per tamany"
 
-#: ../rpmdrake:1180
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Tots els paquets, per estat de selecció"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Ordenat per data de instal·lació."
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Tots els paquets, per grup"
 
-#: ../rpmdrake:1184
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Actualitzacions normals"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Actualitzacions de seguretat"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Actualitzacions que reparen errors"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Actualitzacions normals"
 
-#: ../rpmdrake:1184
-msgid "Security updates"
-msgstr "Actualitzacions de seguretat"
-
-#: ../rpmdrake:1247
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "en noms"
 
-#: ../rpmdrake:1249
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "en descripcions "
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "en noms de fitxers"
 
-#: ../rpmdrake:1278
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Primer necessiteu escollir alguns paquets."
 
-#: ../rpmdrake:1287
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "S'han seleccionat massa paquets"
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1285
+#, 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"
@@ -1496,145 +1773,174 @@ msgstr ""
 "\n"
 "Realment voleu instal·lar els paquets seleccionats?"
 
-#: ../rpmdrake:1320 ../rpmdrake:1323 ../rpmdrake:1334 ../rpmdrake:1347
-#: ../rpmdrake:1356
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Fitxer"
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Actualitza les fonts"
 
-#: ../rpmdrake:1334
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Esborra la selecció"
 
-#: ../rpmdrake:1347
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Recarrega la llista de paquets"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Surt"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1359 ../rpmdrake:1360 ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Opcions"
 
-#: ../rpmdrake:1360
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Gestor de Fonts de Programari"
 
-#: ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Mostra automàticament els paquets seleccionats"
 
-#: ../rpmdrake:1367 ../rpmdrake:1368 ../rpmdrake:1369 ../rpmdrake:1370
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Informeu d'un error"
 
-#: ../rpmdrake:1370
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Quant a..."
 
-#. nicer formatting
-#: ../rpmdrake:1373
-#, fuzzy
+#: ../rpmdrake:1370
+#, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:1375
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1377
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1379
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1384
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Albert Astals Cid <astals11@terra.es>\n"
 "Ticià Sala <tsala@pie.xtec.es>\n"
 
-#: ../rpmdrake:1408
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Troba:"
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Cerca"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Neteja"
 
-#: ../rpmdrake:1433 ../rpmdrake.pm:758
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
 msgid "Select all"
 msgstr "Selecciona-ho tot"
 
-#: ../rpmdrake:1440
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Aplica"
 
-#: ../rpmdrake:1444
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Surt"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1461
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1462
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1463
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
 #: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
-msgid "Initializing..."
-msgstr "S'està inicialitzant..."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Espereu si us plau"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
 msgid "Package installation..."
 msgstr "Instal·lació dels paquets..."
 
-#: ../rpmdrake:1507 ../rpmdrake:1932 ../rpmdrake.pm:311
-msgid "Please wait"
-msgstr "Espereu si us plau"
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "S'està inicialitzant..."
 
-#: ../rpmdrake:1530 ../rpmdrake:1918
-#, fuzzy
+#
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "Configuració de la LAN"
+msgstr "Configuració"
 
-#: ../rpmdrake:1532
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1646,12 +1952,13 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake:1541
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Ja existeix la font d'actualització"
 
-#: ../rpmdrake:1542
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1667,12 +1974,13 @@ msgstr ""
 "\n"
 "Després reinicieu la %s."
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Com escollir manualment la rèplica"
 
-#: ../rpmdrake:1554
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1686,67 +1994,73 @@ msgstr ""
 "\n"
 "Aleshores, reinicieu %s. "
 
-#: ../rpmdrake:1567
-#, fuzzy
+#: ../rpmdrake:1570
+#, fuzzy, c-format
 msgid "Reading updates description"
 msgstr "en descripcions "
 
-#: ../rpmdrake:1593 ../rpmdrake:1670
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Espereu mentre es cerquen els paquets disponibles... "
 
-#: ../rpmdrake:1601
-#, fuzzy
+#: ../rpmdrake:1604
+#, fuzzy, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Si us plau espereu, llistant els paquets..."
 
-#: ../rpmdrake:1637
-#, fuzzy
+#: ../rpmdrake:1640
+#, fuzzy, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Espereu mentre es cerquen els paquets disponibles... "
 
-#: ../rpmdrake:1771
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Inspeccionant %s"
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "canvis:"
 
-#: ../rpmdrake:1780
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Elimina .%s"
 
-#: ../rpmdrake:1784
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Utilitzar .%s com a fitxer principal"
 
-#: ../rpmdrake:1788
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "No facis res"
 
-#: ../rpmdrake:1804
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Instal·lació finalitzada"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "S'està inspeccionant..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1852 ../rpmdrake:2045
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Tots els paquets demanats s'han instal·lat correctament."
 
-#: ../rpmdrake:1856 ../rpmdrake:2025
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Hi ha hagut problemes durant la instal·lació "
 
-#: ../rpmdrake:1857 ../rpmdrake:2026 ../rpmdrake:2084
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1756,17 +2070,18 @@ msgstr ""
 "\n"
 "%s "
 
-#: ../rpmdrake:1876
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "No és possible aconseguir els paquets de fonts."
 
-#: ../rpmdrake:1877
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "No és possible aconseguir els paquets de fonts, ho sento. %s"
 
-#: ../rpmdrake:1878 ../rpmdrake:1976
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1778,60 +2093,83 @@ msgstr ""
 "Error(s) reportats:\n"
 "%s"
 
-#: ../rpmdrake:1894
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Per complir les dependències, s'instal·laran els %d paquets següents:\n"
+"%s\n"
+msgstr[1] ""
 "Per complir les dependències, s'instal·laran els %d paquets següents:\n"
 "%s\n"
 
-#: ../rpmdrake:1898
-#, fuzzy, perl-format
-msgid "Remove %d packages?"
-msgstr "Elimina una clau"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Elimina una clau"
+msgstr[1] "Elimina una clau"
 
-#: ../rpmdrake:1899
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"S'han d'eliminar els següents paquets perquè altres siguin actualitzats:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Esteu d'acord en continuar?"
+msgstr[1] ""
 "S'han d'eliminar els següents paquets perquè altres siguin actualitzats:\n"
 "\n"
 "%s\n"
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake:1941
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Esteu d'acord en continuar?"
+
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Canvieu la font"
 
-#: ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Per favor, inseriu la font anomenada \"%s\" en el dispositiu [%s]"
 
-#: ../rpmdrake:1927
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "S'està descarregant el paquet '%s' (%s/%s)..."
 
-#: ../rpmdrake:1947
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Verificant les firmes dels paquets"
 
-#: ../rpmdrake:1960 ../rpmdrake.pm:737 ../rpmdrake.pm:846
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Advertència"
 
-#: ../rpmdrake:1961
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1845,12 +2183,13 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar amb la instal·lació?"
 
-#: ../rpmdrake:1973 ../rpmdrake:2083
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Instal·lació fallida"
 
-#: ../rpmdrake:1974
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1862,26 +2201,28 @@ msgstr ""
 "\n"
 "Hauríeu d'actualitzar la base de dades de les teves fonts."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "S'estan preparant els paquets per a la instal·lació... "
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "S'està preparant..."
 
-#: ../rpmdrake:1991
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "S'està instal·lant el paquet '%s' (%s/%s)..."
 
-#: ../rpmdrake:2006
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
 
-#: ../rpmdrake:2040
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1894,45 +2235,50 @@ msgstr ""
 "rpmsave',\n"
 "ara podeu inspeccionar-los per a emprendre accions:"
 
-#: ../rpmdrake:2048
-#, fuzzy
+#: ../rpmdrake:2073
+#, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "Informació normal"
 
-#: ../rpmdrake:2050
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Aquests paquets venen amb informació d'actualització"
 
-#: ../rpmdrake:2058
-#, fuzzy
+#: ../rpmdrake:2083
+#, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "Més informació del paquet..."
 
-#: ../rpmdrake:2061
-#, fuzzy, perl-format
+#: ../rpmdrake:2086
+#, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "Més informació del paquet... [%s]"
 
-#: ../rpmdrake:2073 ../rpmdrake.pm:724 ../rpmdrake.pm:805 ../rpmdrake.pm:829
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Error"
 
-#: ../rpmdrake:2074
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Error irrecuperable. No s'han trobat els paquets necessaris per a la "
 "instalació. "
 
-#: ../rpmdrake:2099
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Si us plau, espereu, s'estan esborrant els paquets..."
 
-#: ../rpmdrake:2110
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Hi ha hagut un problema durant la desinstal·lació"
 
-#: ../rpmdrake:2111
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1942,11 +2288,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2143
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Benvingut"
 
-#: ../rpmdrake:2148
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1958,8 +2306,8 @@ msgstr ""
 "Aquesta eina us ajudarà a escollir quin programari voleu eliminar del\n"
 "vostre ordinador."
 
-#: ../rpmdrake:2153
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1971,11 +2319,13 @@ msgstr ""
 "Aquesta eina us ajudarà a escollir les actualitzacions que voleu instal·lar\n"
 "en el vostre.ordinador."
 
-#: ../rpmdrake:2158
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Benvinguts a l'eina d'instal·lació de programari!"
 
-#: ../rpmdrake:2159
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1990,172 +2340,214 @@ msgstr ""
 "programari\n"
 "voleu instal·lar en el vostre ordinador."
 
-#: ../rpmdrake.pm:103
-msgid "Mandriva Linux Update"
-msgstr "Actualització de Mandriva Linux"
-
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Actualització de Programari"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Actualització de Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, c-format
 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:131
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Nom d'usuari:"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Eliminació de Paquets de Programari"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Actualització de Paquets de Programari"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Instal·lació de Paquets de Programari"
 
-#: ../rpmdrake.pm:218
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:222
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Sí"
 
-#: ../rpmdrake.pm:272
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Informació..."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Àustria"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Austràlia"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Bèlgica"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Canadà"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Suïssa"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "República Txeca"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Alemanya"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake.pm:399 ../rpmdrake.pm:403
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grècia"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Espanya"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlàndia"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "França"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Hongria"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel "
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Itàlia"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japó"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Països Baixos"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polònia"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rússia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Suècia"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Eslovàquia"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Regne Unit"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Xina"
 
-#: ../rpmdrake.pm:420 ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Estats Units"
 
-#: ../rpmdrake.pm:520
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2167,7 +2559,8 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2180,28 +2573,30 @@ msgstr ""
 "\n"
 "Esteu d'acord en continuar?"
 
-#: ../rpmdrake.pm:530 ../rpmdrake.pm:568
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "Seleccions de %s"
 
-#: ../rpmdrake.pm:533
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Si us plau, espereu, s'estan baixant les adreces de les rèpliques."
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:535
+#, c-format
 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."
 
-#. - seems that value is bitten before being printed by next func..
-#: ../rpmdrake.pm:541
+#: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "S'ha produït un error durant la descàrrega"
 
-#: ../rpmdrake.pm:543
-#, perl-format
+#: ../rpmdrake.pm:544
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2215,8 +2610,8 @@ msgstr ""
 "La xarxa, o la web, deuen ser inaccessibles.\n"
 "Si us plau, proveu-ho més tard."
 
-#: ../rpmdrake.pm:548
-#, perl-format
+#: ../rpmdrake.pm:549
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2230,15 +2625,18 @@ msgstr ""
 "La xarxa, o la web de Mandriva, deuen ser inaccessibles.\n"
 "Si us plau, proveu-ho més tard."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Sense rèplica"
 
-#: ../rpmdrake.pm:560
+#: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "No s'ha pogut trobar cap rèplica adequada."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2252,64 +2650,69 @@ msgstr ""
 "quan l'arquitectura del seu processador no és suportada \n"
 "per Mandriva Linux Official Updates."
 
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Si us plau, seleccioneu la rèplica desitjada."
 
-#: ../rpmdrake.pm:633
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copiant fitxer per a la font `%s'..."
 
-#: ../rpmdrake.pm:636
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinant el fitxer de fonts `%s'..."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinant el fitxer remot de fonts `%s'..."
 
-#: ../rpmdrake.pm:643
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " fet."
 
-#: ../rpmdrake.pm:647
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " error!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:651
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s de la font %s"
 
-#: ../rpmdrake.pm:655
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Començant la baixada de `%s'..."
 
-#: ../rpmdrake.pm:659
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-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:662
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Baixada de `%s', velocitat: %s"
 
-#: ../rpmdrake.pm:673
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Si us plau espereu, actualitzant dades..."
 
-#: ../rpmdrake.pm:700
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Error recuperant els paquets"
 
-#: ../rpmdrake.pm:701
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2326,27 +2729,31 @@ msgstr ""
 "de\n"
 "tornar-ho a intentar més tard."
 
-#: ../rpmdrake.pm:732
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Actualitza la(es) font(s)"
 
-#: ../rpmdrake.pm:737
+#: ../rpmdrake.pm:739
+#, c-format
 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:744
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Seleccioneu la(es) font(s) que voleu actualitzar:"
 
-#: ../rpmdrake.pm:762
+#: ../rpmdrake.pm:764
+#, c-format
 msgid "Update"
 msgstr "Actualitza"
 
-#: ../rpmdrake.pm:783
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2358,8 +2765,8 @@ msgstr ""
 "Errors:\n"
 "%s"
 
-#: ../rpmdrake.pm:806 ../rpmdrake.pm:817
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2369,16 +2776,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:829
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "No es pot crear la font."
 
-#: ../rpmdrake.pm:834
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Fallada al afegir una font"
 
-#: ../rpmdrake.pm:835
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2388,8 +2797,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:848
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2399,8 +2808,8 @@ msgstr ""
 "esteu usant (%s).\n"
 "Es deshabilitarà."
 
-#: ../rpmdrake.pm:851
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2410,11 +2819,13 @@ msgstr ""
 "Linux que esteu usant (%s).\n"
 "Es deshabilitarà."
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Ajuda executada en segon pla."
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2700,9 +3111,6 @@ msgstr "Gestor de Fonts de Programari"
 #~ msgid "No package found for installation."
 #~ msgstr "No s'ha trobat cap paquet per instal·lar"
 
-#~ msgid "Stop"
-#~ msgstr "Para"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "Tots els paquets, per dipòsit de fonts"
 
diff --git a/po/cy.po b/po/cy.po
index ed490491..7fb7a351 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -17,6 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Welsh\n"
 "X-Poedit-Country: UK\n"
+"Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
 #: ../edit-urpm-sources.pl:85
 #, c-format
diff --git a/po/da.po b/po/da.po
index 8d0231b6..c9d6f00f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-10-01 01:30+0200\n"
 "Last-Translator: Keld Simonsen <keld@rap.dk>\n"
 "Language-Team:  <da@li.org>\n"
@@ -23,12 +23,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Vælg medietype"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -53,16 +56,18 @@ msgstr ""
 "skal så\n"
 "gøre dette i to trin.)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Kilder for distribution"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Officielle opdateringer"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -80,84 +85,104 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Vent venligst, tilføjer medie..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Tilføj et medie"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Sti:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC-server"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP-server"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "sti eller monteringspunkt:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Udskiftelig enhed"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "sti eller monteringspunkt:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Gennemse..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativ sti til syntese eller hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Opret et medie for en hel distribution"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Gennemsøg dette medie for opdateringer"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Du skal udfylde i det mindste de to første indgange."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -165,109 +190,132 @@ msgstr ""
 "Der er allerede et medie med dette navn, ønsker du\n"
 "virkelig at erstatte dette?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Tilføjer et medie:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Medietype:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "O.k."
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Generelle valgmuligheder for installation af pakker"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "altid"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "aldrig"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Efterprøv RPM'er som skal installeres"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Hent program der skal bruges:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Fjernelse af kilde"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-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:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Vent venligst, fjerner medie..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Redigér et medie"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Redigerer medie '%s':"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Gem ændringer"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, 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:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Konfigurér proxyer"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxy-opsætning for medie '%s'"
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Global proxy-opsætning"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -275,139 +323,173 @@ msgstr ""
 "Hvis du har brug for en proxy, skal du indtaste værtsnavnet og eventuelt en "
 "port (syntaks: <proxyvært[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Værtsnavn for proxy:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Bruger:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Tilføj en parallel gruppe"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Redigér en parallel gruppe"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Tilføj en mediegrænse"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Tilføj en vært"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redigerer parallel gruppe '%s':"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Mediegrænse:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Tilføj"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Værter:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfigurér parallel urpmi (distribueret udførelse af urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Medie-begrænsking"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Medie-begrænsking"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Kommando"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Redigér..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Tilføj..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Administrér nøgler for digitale underskrifter på pakker"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Medie"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Nøgler"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Tilføj en nøgle"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Luk"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Fjern en nøgle"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -415,32 +497,38 @@ msgstr ""
 "Er du sikker på at du vil fjerne nøglen %s fra mediet %s?\n"
 "(navn på nøglen: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Tilføj en nøgle..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Fjern nøgle"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Konfigurér medier"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Aktiveret?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Opdateringer?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 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:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -450,32 +538,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Tilføj tilpasset..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Opdatér..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Administrér nøgler..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Parallel..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Generelle valgmuligheder..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -485,7 +579,8 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -500,7 +595,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -512,12 +608,13 @@ msgstr ""
 "på en anden maskine, eller er du også i øjeblikket i færd med at installere\n"
 "pakker?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Kunne ikke tilføje medie, forkert eller manglende argumenter"
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -527,8 +624,8 @@ msgstr ""
 "Dette betyder at du vil kunne tilføje nye programpakker\n"
 "til dit system fra disse nye medier."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -538,59 +635,67 @@ msgstr ""
 "Dette betyder at du vil kunne tilføje nye programpakker\n"
 "til dit system fra dette nye medie."
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Tilføjelse af medie %s gennemført."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Tilføjelse af medie '%s' gennemført."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Brug: %s [VALGMULIGHEDER]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 "  --changelog-first      vis ændringslog før filliste i beskrivelsesvinduet"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     begræns til angivet medie"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 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:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            sæt tilstand (install (standard), remove, update)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 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:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      opdatér ikke medie ved opstart"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        efterprøv ikke pakkeunderskrifter"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -598,27 +703,33 @@ msgstr ""
 "  --parallel=alias,host  vær i parallel-tilstand, brug \"alias\" gruppe, "
 "brug \"host\" maskine til at vise krævede afhængigheder"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    vis kun disse pakker"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      vælg disse pakker på forhånd"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 gennemtving kørsel som root"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           kør søgning for \"pkg\""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Kører i brugertilstand"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -628,545 +739,785 @@ msgstr ""
 "Du vil ikke kunne udføre ændringer på systemet,\n"
 "men du vil alligevel kunne kigge på den eksisterende database."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Tilgængelighed"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arkivering"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Sikkerhedskopi"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Cd-brænding"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Andet"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Bøger"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Edb-bøger"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "OSS"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Opskrifter"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Litteratur"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Klynge"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Beskedsoverføring"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Køtjenester"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Kommunikation"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Databaser"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Udvikling"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME og GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE og Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kerne"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Redigering"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Uddannelse"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulatorer"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Filværktøjer"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Spil"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Æventyr"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Bræt"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kort"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Gåder"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategi"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Grafisk skrivebord"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM baseret"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Overvåger"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedie"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Netværk"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Filoverførsel"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Øjeblikkelig besked"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Post"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Nyheder"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Fjernadgang"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Kontor"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Offentlige nøgler"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publicering"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Naturvidenskab"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomi"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Kemi"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Datalogi"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geologi"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematik"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fysik"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Skaller"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Konfigurering"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Opstart og initialisering"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Udstyr"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pakning"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Udskrift"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Udnyttelse"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Udnyttelse"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsol"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internationalisering"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kerne og udstyr"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Biblioteker"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Servere"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminaler"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Tekstværktøjer"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Legetøj"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Arbejdsstation"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Konsolværktøjer"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Spillemaskine"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Internet-station"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimedie-station"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Netværksmaskine (klient)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Kontor-arbejdsstation"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Grafisk miljø"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Gnome-arbejdsstation"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "IceWm Desktop"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE-arbejdsstation"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Andre grafiske miljøer"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Server"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Brandmur/ruter"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Netværksmaskine server"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Ingen tilgængelig)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Søgeresultater"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Søgeresultater (ingen)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Vent venligst, søger..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Kan tilføjes"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Administration af programmel"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr ""
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Kan opdateres"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Ikke valgt"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Kan tilføjes"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Valgt"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Ikke valgt"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Vigtighed: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Årsag til opdatering: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Sikkerhedsråd"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Filer:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Ændringslog:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Filer:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Ændringslog:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Medie: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Nuværende installeret version: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Version: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Arkitektur: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Størrelse: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Resumé: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Administration af programmel"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Mere information om pakken..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "En af følgende pakker behøves:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Vælg"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "En af følgende pakker behøves:"
+msgstr[1] "En af følgende pakker behøves:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Vent venligst, lister pakker..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Ingen opdatering"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1176,34 +1527,41 @@ msgstr ""
 "findes nogen tilgængelige opdateringer for programmerne installeret\n"
 "på maskinen eller at du allerede har installeret dem alle."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Alt"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Mere info"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Information om pakker"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Nogle yderligere pakker skal fjernes"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "På grund af deres afhængigheder vil disse pakker også blive fjernet:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Visse pakker kan ikke fjernes"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1211,7 +1569,8 @@ msgstr ""
 "Desværre, fjernelse af disse pakker ville ødelægge systemet:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1221,11 +1580,13 @@ msgstr ""
 "afmarkeres nu:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Yderligere pakker behøves"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1234,129 +1595,164 @@ msgstr ""
 "For at opfylde afhængigheder skal følgende pakker også installeres:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (tilhører overspringningslisten)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Visse pakker kan ikke installeres"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Visse pakker kan ikke installeres"
+msgstr[1] "Visse pakker kan ikke installeres"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Desværre, de følgende pakker kan ikke vælges:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Desværre, de følgende pakker kan ikke vælges:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Visse pakker skal fjernes"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Valgt: %s / Fri diskplads: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Valgt størrelse: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Beskrivelse ikke tilgængelig for denne pakke\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "En fatal fejl skete: %s."
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Installeret"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Ikke installeret"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s valg"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-valg"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Alle pakker, efter opdateringstilgængelighed"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Alle pakker, efter størrelse"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Alle pakker, efter valgstatus"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Kun blade, sorteret efter installeringsdato"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Alle pakker, efter gruppe"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Alle opdateringer"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Sikkerhedsopdateringer"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Fejlretningsopdateringer"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Normale opdateringer"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Sikkerhedsopdateringer"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "i navne"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "i beskrivelser"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "i filnavne"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Fejl: %s ser ud til at være monteret kun læsbart."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Du skal vælge nogen pakker først."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "For mange pakker er valgt"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1371,132 +1767,174 @@ msgstr ""
 "\n"
 "Ønsker du virkeligt at installere alle de valgte pakker?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Filer"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Opdatér medier"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Nulstil det valgte"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Genindlæs _pakkelisten"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Afslut"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Valgmuligheder"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Media Manager"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Vis automatisk valgte pakker"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapportér fejl"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Om..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "Om Rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Ophavsret © %s ved Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake er Mandriva Linux' værktøj til pakkeadministration."
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Keld Simonsen <keld@dkuug.dk>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Find:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Søg"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Nulstil"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Vælg alt"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Anvend"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Hurtig introduktion"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "Du kan bladre i pakkerne via kategoritræet til venstre."
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Du kan se information om en pakke ved at klikke på den i listen til højre."
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "For at installere, opdatere eller fjerne en pakke skal du blot klikke i "
 "afkrydsningsfeltet."
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "fatal fejl"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "En fatal fejl skete: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Vent venligst"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Installation af pakker"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Initialiserer..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Bekræftelse"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1508,12 +1946,13 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Allerede eksisterende opdateringsmedier"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1529,12 +1968,13 @@ msgstr ""
 "\n"
 "Derefter skal %s genstartes."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hvordan du manuelt vælger dit spejl"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1548,56 +1988,73 @@ msgstr ""
 "\n"
 "Derefter skal %s genstartes."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "i beskrivelser"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vent venligst, finder tilgængelige pakker..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Vent venligst, læser pakkedatabase..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Vent venligst, lister pakker..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Vent venligst, finder tilgængelige pakker..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Undersøger %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "ændringer:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Fjern .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Brug .%s som hovedfil"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Gør ingenting"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Installationen færdig"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Undersøg..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Alle ønskede pakker blev installeret uden problemer."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Problem ved installationen"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1607,17 +2064,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Kunne ikke hente kildepakker."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Desværre, kunne ikke hente kildepakker. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1629,68 +2087,85 @@ msgstr ""
 "Fejl rapporteret:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"For at tilfredsstille afhængigheder vil de følgende %d pakker blive "
+"installeret:\n"
+"%s\n"
+msgstr[1] ""
 "For at tilfredsstille afhængigheder vil de følgende %d pakker blive "
 "installeret:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Fjern en nøgle"
+msgstr[1] "Fjern en nøgle"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Følgende pakker skal fjernes for at andre skal kunne opgraderes:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Er det O.k. at fortsætte?"
+msgstr[1] ""
 "Følgende pakker skal fjernes for at andre skal kunne opgraderes:\n"
 "\n"
 "%s\n"
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Initialiserer..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Installation af pakker"
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Vent venligst"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Er det O.k. at fortsætte?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Skift media"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Indsæt venligst mediet med navnet \"%s\" i enhed [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Henter pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Efterprøver pakkeunderskrifter..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1704,12 +2179,13 @@ msgstr ""
 "\n"
 "Ønsker du at fortsætte installeringen?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Installationen mislykkedes"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1721,25 +2197,28 @@ msgstr ""
 "\n"
 "Du skal måske opdatere din mediedatabase."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Forbereder installation af pakker"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kunne ikke få adgang til rpm-fil [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1751,33 +2230,48 @@ msgstr ""
 "Nogen konfigurationsfiler blev oprettet som '.rpmnew' eller '.rpmsave',\n"
 "du kan nu kigge på nogen for at tage aktion:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Disse pakker har opgraderings-information"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Mere information om pakken..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Mere information om pakken...[%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Fejl"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Alvorlig fejl: ingen pakke fundet til installation. Beklager."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Vent venligst, fjerner pakker..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Problem ved fjernelse"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1787,11 +2281,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1803,8 +2299,8 @@ msgstr ""
 "Dette værktøj hjælper dig med at vælge hvilke programmer du vil fjerne fra\n"
 "maskinen."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1816,11 +2312,13 @@ msgstr ""
 "Dette værktøj hjælper dig med at vælge opdateringerne du vil\n"
 "installere på maskinen."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Velkommen til værktøjet for programinstallering!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1835,172 +2333,213 @@ msgstr ""
 "programmer\n"
 "du vil installere på maskinen."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Opdatér"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Opdatering af programmel"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Opdatér"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Indtast dine adgangsoplysninger for adgang til proxy\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Brugernavn:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Fjernelse af programpakker"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Opdatering af programpakker"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Installation af programpakker"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Nej"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Østrig"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australien"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Tjekkiet"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grækenland"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Frankrig"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italien"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norge"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polen"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakiet"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "U.S.A."
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2012,7 +2551,8 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2024,25 +2564,28 @@ msgstr ""
 "\n"
 "Er det O.k. at fortsætte?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Valg af spejl"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Vent venligst, henter adresser på spejle."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Vent venligst, henter spejladresser fra Mandrivas websted."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Fejl under hentning"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2057,7 +2600,7 @@ msgstr ""
 "Forsøg igen senere."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2072,14 +2615,17 @@ msgstr ""
 "Forsøg igen senere."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Intet spejl"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Jeg kan ikke finde et passende spejl."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2094,63 +2640,68 @@ msgstr ""
 "Mandriva Linux' officielle opdateringer."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Vælg ønsket spejl."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierer fil for medie `%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Undersøger fil fra medie '%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Undersøger ekstern fil for medie '%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " færdig."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " mislykkedes!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s fra medie %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Starter hentning af `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Hentning af `%s', resterende tid:%s, hastighed:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Hentning af `%s', hastighed:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Vent venligst, opdaterer medie..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Fejl ved hentning af pakker"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2165,31 +2716,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:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Opdatér medier"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 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:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Venligst vælg det medie du ønsker at opdatere:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Vælg alt"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Opdatér"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2201,8 +2752,8 @@ msgstr ""
 "Fejl:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2212,16 +2763,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Kan ikke lave medie."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Fejl ved tilføjelse af medie"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2231,8 +2784,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2242,8 +2795,8 @@ msgstr ""
 "kører (%s).\n"
 "Det vil blive deaktiveret."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2253,11 +2806,13 @@ msgstr ""
 "Linux som du kører (%s).\n"
 "Den vil blive deaktiveret."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Hjælp startes i baggrunden"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2532,3 +3087,6 @@ msgstr "Fjern programmel"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Administration af programmelmedier"
+
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Vent venligst, læser pakkedatabase..."
diff --git a/po/de.po b/po/de.po
index 0b3997f9..88de9b3f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -25,6 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../edit-urpm-sources.pl:85
 #, c-format
diff --git a/po/el.po b/po/el.po
index db115940..20d795da 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 09:56+0100\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +21,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Επιλέξτε είδος μέσων"
 
 #: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -52,15 +55,17 @@ msgstr ""
 "να το κάνετε σε δύο στάδια.)"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Πηγές διανομής"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Επίσημες αναβαθμίσεις"
 
 #: ../edit-urpm-sources.pl:97
-#, perl-format
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -79,87 +84,104 @@ msgstr ""
 "\n"
 "Να συνεχίσω;"
 
-#. because updates media do not provide media.cfg yet
 #: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Παρακαλώ περιμένετε, προσθήκη μέσου..."
 
 #: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Προσθήκη ενός μέσου"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Τοπικά αρχεία"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Θέση:"
 
 #: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Διακομιστής FTP"
 
 #: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:416
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
 #: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "Διακομιστής  RSYNC"
 
 #: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Διακομιστής HTTP"
 
 #: ../edit-urpm-sources.pl:150
-msgid "Path or mount point:"
-msgstr "Θέση ή σημείο προσάρτησης:"
-
-#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Αφαιρούμενη συσκευή"
 
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Θέση ή σημείο προσάρτησης:"
+
 #: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Αναζήτηση..."
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Προσπέλαση:"
 
-#: ../edit-urpm-sources.pl:197 ../edit-urpm-sources.pl:501 ../rpmdrake.pm:131
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ../edit-urpm-sources.pl:202 ../edit-urpm-sources.pl:417
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Σχετική θέση των synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:204
-#, fuzzy
+#: ../edit-urpm-sources.pl:203
+#, fuzzy, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Αν μείνει κενό, το synthesis/hdlist  θα επιμεληθεί αυτόματα"
 
-#: ../edit-urpm-sources.pl:209
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../edit-urpm-sources.pl:217
-#, fuzzy
+#: ../edit-urpm-sources.pl:216
+#, fuzzy, c-format
 msgid "Create media for a whole distribution"
 msgstr "Δημιουργία μέσων για μια ολόκληρη διανομή"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Αναζήτηση για αναβαθμίσεις στο μέσον"
 
-#: ../edit-urpm-sources.pl:238
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Πρέπει να συμπληρώσετε τουλάχιστον τα δύο πρώτα πεδία."
 
-#: ../edit-urpm-sources.pl:242
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -167,115 +189,133 @@ msgstr ""
 "Υπάρχει ήδη ένα μέσο με αυτό το όνομα, είστε βέβαιοι\n"
 "για την αντικατάστασή του;"
 
-#: ../edit-urpm-sources.pl:253
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Προσθήκη ενός μέσου:"
 
-#: ../edit-urpm-sources.pl:255
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Τύπος μέσου:"
 
-#: ../edit-urpm-sources.pl:263 ../edit-urpm-sources.pl:338
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:453
-#: ../edit-urpm-sources.pl:518 ../edit-urpm-sources.pl:600
-#: ../edit-urpm-sources.pl:640 ../edit-urpm-sources.pl:698
-#: ../edit-urpm-sources.pl:837 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:1921 ../rpmdrake:1929 ../rpmdrake.pm:287 ../rpmdrake.pm:596
-#: ../rpmdrake.pm:681 ../rpmdrake.pm:754
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: ../edit-urpm-sources.pl:265 ../edit-urpm-sources.pl:340
-#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:508
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:639
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:763
-#: ../edit-urpm-sources.pl:830 ../edit-urpm-sources.pl:883
-#: ../edit-urpm-sources.pl:1032 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:977 ../rpmdrake:982 ../rpmdrake:1827 ../rpmdrake:1921
-#: ../rpmdrake:2068 ../rpmdrake.pm:122 ../rpmdrake.pm:227 ../rpmdrake.pm:289
-#: ../rpmdrake.pm:596
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Καθολικές επιλογές για εγκατάσταση πακέτου"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "πάντα"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "ποτέ"
 
-#: ../edit-urpm-sources.pl:334
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Επιβεβαιώστε RPMs προς εγκατάσταση:"
 
-#: ../edit-urpm-sources.pl:335
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Λήψη προγράμματος προς χρήση:"
 
-#: ../edit-urpm-sources.pl:365
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Αφαίρεση Πηγής"
 
-#: ../edit-urpm-sources.pl:366
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Είστε βέβαιοι για την αφαίρεση της πηγής\" %s \";"
 
-#: ../edit-urpm-sources.pl:371
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Παρακαλώ περιμένετε, αφαιρείται το μέσο..."
 
-#: ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Επεξεργασία ενός μέσου"
 
-#: ../edit-urpm-sources.pl:413
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Επεξεργασία μέσου \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
 msgid "Downloader:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:430
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Αποθήκευση αλλαγών"
 
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:1019
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Διαμεσολαβητής..."
 
-#: ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Πρέπει να εισάγετε το μέσο για να συνεχίσετε"
 
-#: ../edit-urpm-sources.pl:452
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 "Για να αποθηκευτούν οι αλλαγές, θα πρέπει να εισάγετε το μέσο στον οδηγό."
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Ρύθμιση διαμεσολαβητών"
 
-#: ../edit-urpm-sources.pl:484
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Ρυθμίσεις διαμεσολαβητή για μέσον \"%s\""
 
-#: ../edit-urpm-sources.pl:485
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Καθολικές ρυθμίσεις διαμεσολαβητή"
 
-#: ../edit-urpm-sources.pl:487
-#, fuzzy
+#: ../edit-urpm-sources.pl:485
+#, fuzzy, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -284,122 +324,144 @@ msgstr ""
 "και μια προαιρετική θύρα(σύνταξη:<διαμεσολαβητής κεντρικού υπολογιστή[:θύρα]"
 "> / <proxyhost[:port]>)"
 
-#: ../edit-urpm-sources.pl:490
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Όνομα κεντρικού υπολογιστή διαμεσολαβητή:"
 
-#: ../edit-urpm-sources.pl:493
-#, fuzzy
+#: ../edit-urpm-sources.pl:491
+#, fuzzy, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Μπορείτε να ορίσετε ένα χρήστη/κωδικό για την πιστοποίηση ταυτότητας του "
 "διαμεσολαβητή:"
 
-#: ../edit-urpm-sources.pl:496
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Χρήστης:"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Προσθήκη παράλληλης ομάδας"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Επεξεργασία μιας παράλληλης ομάδας"
 
-#: ../edit-urpm-sources.pl:579
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Προσθήκη ενός ορίου μέσου"
 
-#: ../edit-urpm-sources.pl:591
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Επιλέξτε ένα μέσο για προσθήκη στο όριο μέσων:"
 
-#: ../edit-urpm-sources.pl:628
-#, fuzzy
+#: ../edit-urpm-sources.pl:626
+#, fuzzy, c-format
 msgid "Add a host"
 msgstr "Προσθήκη ενός κεντρικού υπολογιστή"
 
-#: ../edit-urpm-sources.pl:634
-#, fuzzy
+#: ../edit-urpm-sources.pl:632
+#, fuzzy, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 "Εισάγετε το όνομα του κεντρικού υπολογιστή ή την διεύθυνση IP του προς "
 "προσθήκη κεντρικού υπολογιστή: "
 
-#: ../edit-urpm-sources.pl:665
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Επεξεργασία παράλληλης ομάδας \"%s\":"
 
-#: ../edit-urpm-sources.pl:669
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Όνομα ομάδας:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Πρωτόκολλο:"
 
-#: ../edit-urpm-sources.pl:672
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Όριο μέσου:"
 
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: ../edit-urpm-sources.pl:678 ../edit-urpm-sources.pl:685
-#: ../edit-urpm-sources.pl:743 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: ../edit-urpm-sources.pl:679
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Κεντρικοί Υπολογιστές:"
 
-#: ../edit-urpm-sources.pl:713
-#, fuzzy
+#: ../edit-urpm-sources.pl:711
+#, fuzzy, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Ρυθμίστε παράλληλο urpmi (κατανεμημένη εκτέλεση του urpmi)"
 
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../edit-urpm-sources.pl:716
-msgid "Media limit"
-msgstr "Όριο μέσων"
-
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
-#: ../edit-urpm-sources.pl:717
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Όριο μέσων"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Εντολή"
 
-#: ../edit-urpm-sources.pl:727 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:886 ../rpmdrake:1748
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: ../edit-urpm-sources.pl:747 ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Επεξεργασία"
 
-#: ../edit-urpm-sources.pl:755 ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Προσθήκη..."
 
-#: ../edit-urpm-sources.pl:771
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Διαχείριση κλειδιών για πακέτα με ψηφιακές επιλογές"
 
-#: ../edit-urpm-sources.pl:775 ../edit-urpm-sources.pl:932
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Μέσο"
 
 #: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -407,30 +469,34 @@ msgstr ""
 "_:κρυπτογραφικά κλειδιά\n"
 "Κλειδιά"
 
-#: ../edit-urpm-sources.pl:799
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 "δε βρέθηκε όνομα, το κλειδί δεν υπάρχει στη διαδικασία κλειδιού του rpm "
 
-#: ../edit-urpm-sources.pl:812
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Προσθήκη ενός κλειδιού"
 
-#: ../edit-urpm-sources.pl:824
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Επιλέξτε ένα κλειδί για να προστεθεί στο μέσο %s"
 
-#: ../edit-urpm-sources.pl:833
+#: ../edit-urpm-sources.pl:834
+#, c-format
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: ../edit-urpm-sources.pl:855
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Αφαίρεση ενός κλειδιού"
 
-#: ../edit-urpm-sources.pl:853
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -438,34 +504,40 @@ msgstr ""
 "Είστε βέβαιοι για την αφαίρεση του κλειδιού %s από το μέσο %s?\n"
 "(όνομα κλειδιού: %s)"
 
-#: ../edit-urpm-sources.pl:871
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Προσθήκη ενός κλειδιού..."
 
-#: ../edit-urpm-sources.pl:875
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Αφαίρεση κλειδιού"
 
-#: ../edit-urpm-sources.pl:891
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Ρύθμιση μέσων"
 
-#: ../edit-urpm-sources.pl:930
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Ενεργοποίηση;"
 
-#: ../edit-urpm-sources.pl:931
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Αναβαθμίσεις ;"
 
-#: ../edit-urpm-sources.pl:947
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Το μέσο χρήζει αναβάθμισης για να είναι χρησιμοποιήσιμο. Ν' αναβαθμιστεί "
 "τώρα ;"
 
-#: ../edit-urpm-sources.pl:977
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -475,33 +547,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1011
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Προσθήκη προσαρμογής..."
 
-#: ../edit-urpm-sources.pl:1015
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Αναβάθμιση..."
 
-#: ../edit-urpm-sources.pl:1018
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Διαχείριση κλειδιών..."
 
-#: ../edit-urpm-sources.pl:1020
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Παράλληλη..."
 
-#: ../edit-urpm-sources.pl:1021
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Καθολικές επιλογές..."
 
-#: ../edit-urpm-sources.pl:1031 ../rpmdrake:1428
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../edit-urpm-sources.pl:1047 ../gurpmi.addmedia:98 ../rpmdrake:2144
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -511,7 +588,8 @@ msgstr ""
 "\n"
 "Να συνεχιστεί;"
 
-#: ../edit-urpm-sources.pl:1050
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -526,7 +604,8 @@ msgstr ""
 "να \n"
 "εγκατασταθούν σαν νέα πακέτα ή να αναβαθμίσετε υπάρχοντα πακέτα."
 
-#: ../edit-urpm-sources.pl:1063
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -540,11 +619,12 @@ msgstr ""
 "πακέτων ;)"
 
 #: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Αδυναμία προσθήκης μέσου, εσφαλμένα ή ελλειπή ορίσματα"
 
 #: ../gurpmi.addmedia:102
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -555,7 +635,7 @@ msgstr ""
 "στο σύστημα σας από το νέο μέσο"
 
 #: ../gurpmi.addmedia:105
-#, perl-format
+#, c-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"
@@ -566,21 +646,22 @@ msgstr ""
 "στο σύστημα σας από το νέο μέσο"
 
 #: ../gurpmi.addmedia:130
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "Επιτυχής προσθήκη μέσου '%s'"
 
 #: ../gurpmi.addmedia:131
-#, perl-format
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Επιτυχής προσθήκη μέσου '%s'"
 
 #: ../rpmdrake:39
-#, perl-format
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]..."
 
 #: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -589,12 +670,12 @@ msgstr ""
 "παράθυρο περιγραφης"
 
 #: ../rpmdrake:41
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     όριο στα δεδομένα μέσα"
 
 #: ../rpmdrake:42
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
@@ -602,14 +683,14 @@ msgstr ""
 "rpmsave που βρέθηκαν"
 
 #: ../rpmdrake:43
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            ρυθμίστε κατάσταση (εγκατάσταση (προεπιλεγμένη), "
 "αφαίρεση, αναβάθμιση)"
 
 #: ../rpmdrake:44
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
@@ -617,46 +698,51 @@ msgstr ""
 "κατάσταση αναβαθμίσεως"
 
 #: ../rpmdrake:45
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 "  --no-media-update      να μη γίνεται αναβάθμιση μέσων κατά την εκκίνηση"
 
 #: ../rpmdrake:46
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 "  --no-verify-rpm         να μη γίνεται επιβεβαίωση υπογραφών των πακέτων"
 
 #: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr "  --parallel"
 
 #: ../rpmdrake:48
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nose=pkg1,..    προβολή μόνο αυτών των πακέτων"
 
 #: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..     προεπιλογή αυτών των πακέτων"
 
 #: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root               προτροπή να εκτελεστεί ως βασικό/root"
 
 #: ../rpmdrake:51
-#, fuzzy
+#, fuzzy, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg         εκτελέστε αναζήτηση για \"pkg\""
 
 #: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Εκτέλεση σε λειτουργία χρήστη"
 
 #: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -667,71 +753,86 @@ msgstr ""
 "αλλά θα μπορείτε να περιηγηθείτε στην υπάρχουσα βάση δεδομένων."
 
 #: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Προσιτότητα"
 
 #: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
 #: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Αρχειοθέτηση"
 
 #: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Αντίγραφα Ασφαλείας"
 
 #: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Εγγραφή Cd"
 
 #: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Συμπίεση"
 
 #: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
 #: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
 #: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Άλλα"
 
 #: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
 #: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Βιβλία"
 
 #: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Βιβλία υπολογιστών"
 
 #: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Συχνές Ερωτήσεις"
 
 #: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
 #: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Λογοτεχνία"
 
 #: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Συγκρότημα"
 
 #: ../rpmdrake:227
-#, fuzzy
+#, fuzzy, c-format
 msgid "Message Passing"
 msgstr "Διαβίβαση μηνύματος"
 
 #: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Στοίχιση Υπηρεσιών"
 
 #: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Επικοινωνίες"
 
 #: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Βάσεις Δεδομένων"
 
@@ -739,245 +840,302 @@ msgstr "Βάσεις Δεδομένων"
 #: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
 #: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Ανάπτυξη"
 
 #: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
 #: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
 #: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME και GTK+"
 
 #: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
 #: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE και Qt"
 
 #: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Πυρήνας"
 
 #: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
 #: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
 #: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
 #: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Διορθωτές"
 
 #: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Εκπαίδευση"
 
 #: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Εξομοιωτές"
 
 #: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Εργαλεία αρχείων"
 
 #: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
 #: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
 #: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Παιχνίδια"
 
 #: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Περιπέτεια"
 
 #: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Ηλεκτρονικά"
 
 #: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Επιτραπέζια"
 
 #: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Χαρτιά"
 
 #: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Παζλ"
 
 #: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Αθλητικά"
 
 #: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Στρατηγική"
 
 #: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
 #: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
 #: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Γραφικές Επιφάνειες Εργασίας"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "Τύπου FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
 #: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Γραφικά"
 
 #: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Παρακολούθηση"
 
 #: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Πολυμέσα"
 
 #: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Βίντεο"
 
 #: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
 #: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
 #: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Δικτύωση"
 
 #: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Συζήτηση"
 
 #: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Μεταφορά Αρχείου"
 
 #: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
 #: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Στιγμιαία μηνύματα"
 
 #: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Ταχυδρομείο"
 
 #: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Ειδήσεις"
 
 #: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Απομακρυσμένη πρόσβαση"
 
 #: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "Ιστοσελίδες"
 
 #: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Γραφείο"
 
 #: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Δημόσια κλειδιά"
 
 #: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Εκδόσεις"
 
 #: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
 #: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
 #: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Επιστήμες"
 
 #: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Αστρονομία"
 
 #: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Βιολογία"
 
 #: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Χημεία"
 
 #: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Επιστήμη υπολογιστών"
 
 #: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Φυσικές Επιστήμες"
 
 #: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Μαθηματικά"
 
 #: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Φυσική"
 
 #: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Κελύφοι"
 
 #: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Ήχος"
 
@@ -987,326 +1145,392 @@ msgstr "Ήχος"
 #: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
 #: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
 #: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Σύστημα"
 
 #: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Βάση"
 
 #: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
 #: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
 #: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Εκκίνηση και Init"
 
 #: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Υλικό"
 
 #: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Πακετοποίηση"
 
 #: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Εκτύπωση"
 
 #: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Ανάπτυξη"
 
 #: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Ανάπτυξη"
 
 #: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
 #: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
 
 #: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Κονσόλα"
 
 #: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
 #: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
 #: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
 #: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Διεθνοποίηση"
 
 #: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Πυρήνας και υλικό"
 
 #: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Βιβλιοθήκες"
 
 #: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Διακομιστές"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
 #: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Τερματικά"
 
 #: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Εργαλεία κειμένου"
 
 #: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Παιχνιδάκια"
 
-#. for Mandriva Choice:
 #: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
 #: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
 #: ../rpmdrake:345 ../rpmdrake:346
-#, fuzzy
+#, c-format
 msgid "Workstation"
-msgstr "Ρύθμιση LΑΝ"
+msgstr "Σταθμός Εργασίας"
 
 #: ../rpmdrake:339
-#, fuzzy
+#, c-format
 msgid "Console Tools"
-msgstr "Κονσόλα"
+msgstr "Εργαλεία Κονσόλας"
 
 #: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
 msgid "Documentation"
-msgstr ""
+msgstr "Τεκμηρίωση"
 
 #: ../rpmdrake:341
+#, c-format
 msgid "Game station"
-msgstr ""
+msgstr "Σταθμός παιχνιδιών"
 
 #: ../rpmdrake:342
-#, fuzzy
+#, c-format
 msgid "Internet station"
-msgstr "Διεθνοποίηση"
+msgstr "Σταθμός Διαδικτύου"
 
 #: ../rpmdrake:343
-#, fuzzy
+#, c-format
 msgid "Multimedia station"
-msgstr "Πολυμέσα"
+msgstr "Σταθμός πολυμέσων"
 
 #: ../rpmdrake:344
-#, fuzzy
+#, c-format
 msgid "Network Computer (client)"
-msgstr "Επιστήμη υπολογιστών"
+msgstr "Υπολογιστής Δικτύου (πελάτης)"
 
 #: ../rpmdrake:345
+#, c-format
 msgid "Office Workstation"
-msgstr ""
+msgstr "Σταθμός Εργασίας Γραφείου"
 
 #: ../rpmdrake:346
+#, c-format
 msgid "Scientific Workstation"
 msgstr "Σταθμός Εργασίας Επιστημονικών εφαρμογών"
 
 #: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Graphical Environment"
-msgstr "Γραφικές Επιφάνειες Εργασίας"
+msgstr "Γραφικό Περιβάλλον"
 
 #: ../rpmdrake:349
+#, c-format
 msgid "GNOME Workstation"
-msgstr ""
+msgstr "Σταθμός Εργασίας Gnome"
 
 #: ../rpmdrake:350
+#, fuzzy, c-format
 msgid "IceWm Desktop"
-msgstr ""
+msgstr "Επιφάνεια εργασίας"
 
 #: ../rpmdrake:351
+#, c-format
 msgid "KDE Workstation"
-msgstr ""
+msgstr "Σταθμός εργασίας KDE"
 
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Other Graphical Desktops"
-msgstr "Γραφικές Επιφάνειες Εργασίας"
+msgstr "Άλλα γραφικά περιβάλλοντα"
 
 #: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
 #: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
 #: ../rpmdrake:357
+#, c-format
 msgid "DNS/NIS"
-msgstr ""
+msgstr "DNS/NIS"
 
 #: ../rpmdrake:358
-#, fuzzy
+#, c-format
 msgid "Database"
-msgstr "Βάσεις Δεδομένων"
+msgstr "Βάση Δεδομένων"
 
 #: ../rpmdrake:359
+#, c-format
 msgid "Firewall/Router"
-msgstr ""
+msgstr "Τοίχος Προστασίας/Δρομολογητής"
 
 #: ../rpmdrake:361
+#, c-format
 msgid "Mail/Groupware/News"
 msgstr ""
 
 #: ../rpmdrake:362
-#, fuzzy
+#, c-format
 msgid "Network Computer server"
-msgstr "Επιστήμη υπολογιστών"
+msgstr "Εξυπηρετητής δικτύου"
 
 #: ../rpmdrake:363
+#, c-format
 msgid "Web/FTP"
-msgstr ""
+msgstr "Web/FTP"
 
-#. - to highlight information
-#: ../rpmdrake:502 ../rpmdrake:707 ../rpmdrake:712 ../rpmdrake:726
-#: ../rpmdrake:728
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Δεν είναι διαθέσιμο/η)"
 
-#: ../rpmdrake:534
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Αποτέλεσμα Αναζήτησης"
 
 #: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Αποτέλεσμα Αναζήτησης (κανένα)"
 
-#: ../rpmdrake:545 ../rpmdrake:2125
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Παρακαλώ περιμένετε, γίνεται αναζήτηση..."
 
-#: ../rpmdrake:617 ../rpmdrake:921
-msgid "Addable"
-msgstr "Προστιθέμενα"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Διαχειριστής Μέσων Λογισμικού"
 
-#: ../rpmdrake:617 ../rpmdrake:921
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Τερματισμός"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Αναβαθμίσιμα"
 
-#: ../rpmdrake:619
-msgid "Not selected"
-msgstr "Μη επιλεγμένα"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Προστιθέμενα"
 
 #: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Επιλεγμένα"
 
-#. is it an update?
-#: ../rpmdrake:687 ../rpmdrake:744
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Μη επιλεγμένα"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Σπουδαιότητα: "
 
-#: ../rpmdrake:688 ../rpmdrake:752
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Αιτία αναβάθμισης: "
 
-#: ../rpmdrake:692
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Αναβαθμίσεις Ασφαλείας"
 
-#: ../rpmdrake:700 ../rpmdrake:754
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Χωρίς περιγραφή"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Άρχεία:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Αλλαγές:"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Άρχεία:\n"
 
-#: ../rpmdrake:728
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Αλλαγές:\n"
 
-#: ../rpmdrake:733 ../rpmdrake.pm:807
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Μέσο: "
 
-#: ../rpmdrake:734
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Τρέχουσα εγκατεστημένη έκδοση: "
 
-#: ../rpmdrake:738
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../rpmdrake:739
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Έκδοση: "
 
-#: ../rpmdrake:740
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Αρχιτεκτονική: "
 
-#: ../rpmdrake:741
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:741
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Μέγεθος: "
 
-#. extra empty line
-#: ../rpmdrake:748
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Σύνοψη: "
 
-#: ../rpmdrake:754
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Περιγραφή: "
 
-#: ../rpmdrake:810 ../rpmdrake.pm:179
-#, fuzzy
-msgid "Software Management"
-msgstr "Διαχειριστής Μέσων Λογισμικού"
-
-#: ../rpmdrake:827 ../rpmdrake:973 ../rpmdrake:975
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Περισσότερες πληροφορίες για το πακέτο..."
 
-#: ../rpmdrake:829
-msgid "One of the following packages is needed:"
-msgstr "Ένα από τα παρακάτω πακέτα απαιτούνται:"
-
-#: ../rpmdrake:829
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Παρακαλώ επιλέξτε"
 
-#: ../rpmdrake:870
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Ένα από τα παρακάτω πακέτα απαιτούνται:"
+msgstr[1] "Ένα από τα παρακάτω πακέτα απαιτούνται:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Παρακαλώ περιμένετε, ταξινομούνται τα πακέτα"
 
-#: ../rpmdrake:888
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Χωρίς αναβαθμίσεις"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:885
+#, c-format
 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,24 +1540,29 @@ msgstr ""
 "υπάρχουν διαθέσιμα πακέτα για αναβάθμιση για τα εγκατεστημένα\n"
 "πακέτα του υπολογιστή σας ή τα έχετε ήδη αναβαθμίσει."
 
-#: ../rpmdrake:912 ../rpmdrake:1174
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Όλα"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:960 ../rpmdrake:965
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Περισσότερες πληροφορίες"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Πληροφορίες για τα πακέτα"
 
-#: ../rpmdrake:991
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Ορισμένα επιπλέον πακέτα πρέπει να αφαιρεθούν"
 
-#: ../rpmdrake:992
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1341,11 +1570,13 @@ msgstr ""
 "Για να ικανοποιηθούν οι εξαρτήσεις τους τα παρακάτω πακέτα πρέπει επίσης να "
 "αφαιρεθούν:"
 
-#: ../rpmdrake:998 ../rpmdrake:1007
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Ορισμένα πακέτα δεν μπορούν να αφαιρεθούν"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1353,7 +1584,8 @@ msgstr ""
 "Συγνώμη, αλλά η αφαίρεση αυτών των πακέτων θα καταστρέψει το σύστημά σας:\n"
 "\n"
 
-#: ../rpmdrake:1008 ../rpmdrake:1073
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1363,11 +1595,13 @@ msgstr ""
 "να αποεπιλεγούν:\n"
 "\n"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Απαιτούνται επιπλέον πακέτα"
 
-#: ../rpmdrake:1038
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1377,138 +1611,164 @@ msgstr ""
 " τα παρακάτω πακέτα:\n"
 "\n"
 
-#: ../rpmdrake:1053
-#, fuzzy, perl-format
+#: ../rpmdrake:1049
+#, fuzzy, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (ανήκει στη λίστα των προς παράβλεψη)"
 
-#: ../rpmdrake:1056
-msgid "Some packages can't be installed"
-msgstr "Ορισμένα πακέτα δεν μπορούν να εγκατασταθούν"
-
-#: ../rpmdrake:1057
-#, perl-format
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Ορισμένα πακέτα δεν μπορούν να εγκατασταθούν"
+msgstr[1] "Ορισμένα πακέτα δεν μπορούν να εγκατασταθούν"
+
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Συγνώμη, τα παρακάτω πακέτα(ο) δεν μπορούν να επιλεγούν:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Συγνώμη, τα παρακάτω πακέτα(ο) δεν μπορούν να επιλεγούν:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:1072 ../rpmdrake:1896
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Ορισμένα πακέτα πρέπει να αφαιρεθούν"
 
-#: ../rpmdrake:1101
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Επιλεγμένο: %s/ Ελεύθερος χώρος στον δίσκο: %s"
 
-#: ../rpmdrake:1102
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Επιλεγμένο μέγεθος: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:1107
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Μη διαθέσιμη περιγραφή γι'αυτό το πακέτο\n"
 
-#: ../rpmdrake:1113 ../rpmdrake:1506
-#, perl-format
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Συνέβη ένα μοιραίο σφάλμα: %s."
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Εγκατάσταση"
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Εγκατάσταση"
 
-#: ../rpmdrake:1175
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s επιλογές"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Επιλογές Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1177
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Όλα τα πακέτα, αλφαβητικά"
 
-#: ../rpmdrake:1178
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Όλα τα πακέτα, βάση διαθεσιμότητας αναβάθμισης"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Όλα τα πακέτα, βάση μεγέθους"
 
-#: ../rpmdrake:1180
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Όλα τα πακέτα, βάση κατάστασης επιλογής"
 
-#: ../rpmdrake:1181
-#, fuzzy
+#: ../rpmdrake:1178
+#, fuzzy, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Τερματικοί κόμβοι μόνο, ταξινομημένοι κατά ημερομηνία εγκατάστασης"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Όλα τα πακέτα, βάση ομάδας"
 
-#: ../rpmdrake:1184
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Κανονικές αναβαθμίσεις"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Αναβαθμίσεις Ασφαλείας"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Αναβαθμίσεις διορθώσεων"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Κανονικές αναβαθμίσεις"
 
-#: ../rpmdrake:1184
-msgid "Security updates"
-msgstr "Αναβαθμίσεις Ασφαλείας"
-
-#: ../rpmdrake:1247
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "στα ονόματα"
 
-#: ../rpmdrake:1249
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "στις περιγραφές"
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "στα ονόματα αρχείων"
 
-#: ../rpmdrake:1278
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Πρέπει να επιλέξετε πρώτα κάποια πακέτα."
 
-#: ../rpmdrake:1287
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Έχουν επιλεγεί πάρα πολλά πακέτα"
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1285
+#, 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"
@@ -1524,143 +1784,171 @@ msgstr ""
 " \n"
 " Είστε βέβαιοι για την εγκατάσταση των επιλεγμένων πακέτων;"
 
-#: ../rpmdrake:1320 ../rpmdrake:1323 ../rpmdrake:1334 ../rpmdrake:1347
-#: ../rpmdrake:1356
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Αρχείο"
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Αναβάθμιση μέσων"
 
-#: ../rpmdrake:1334
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Επαναφορά της επιλογής"
 
-#: ../rpmdrake:1347
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Επαναφόρτωση της _λίστας πακέτων"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Εξοδος"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1359 ../rpmdrake:1360 ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Επιλογές"
 
-#: ../rpmdrake:1360
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Διαχειριστής Μέσων Λογισμικού"
 
-#: ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Αυτόματη προβολή επιλεγμένων πακέτων"
 
-#: ../rpmdrake:1367 ../rpmdrake:1368 ../rpmdrake:1369 ../rpmdrake:1370
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Αναφορά Bug"
 
-#: ../rpmdrake:1370
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Σχετικά με..."
 
-#. nicer formatting
-#: ../rpmdrake:1373
-#, fuzzy
+#: ../rpmdrake:1370
+#, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:1375
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C)%s by mandriva"
 
-#: ../rpmdrake:1377
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1379
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1384
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Theophanis Mastakas <mastakas@otenet.gr>\n"
 
-#: ../rpmdrake:1408
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Εύρεση:"
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Καθαρισμός"
 
-#: ../rpmdrake:1433 ../rpmdrake.pm:758
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
 msgid "Select all"
 msgstr "Επιλογή όλων"
 
-#: ../rpmdrake:1440
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Εφαρμογή"
 
-#: ../rpmdrake:1444
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1461
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1462
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1463
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
 #: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Μοιραίο σφάλμα"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
-msgid "Initializing..."
-msgstr "Αρχικοποίηση..."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Παρακαλώ περιμένετε"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
 msgid "Package installation..."
 msgstr "Εγκατάσταση πακέτου..."
 
-#: ../rpmdrake:1507 ../rpmdrake:1932 ../rpmdrake.pm:311
-msgid "Please wait"
-msgstr "Παρακαλώ περιμένετε"
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Αρχικοποίηση..."
 
-#: ../rpmdrake:1530 ../rpmdrake:1918
-#, fuzzy
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "Ρύθμιση LΑΝ"
+msgstr "Ρύθμιση"
 
-#: ../rpmdrake:1532
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1673,12 +1961,13 @@ msgstr ""
 "\n"
 "Να συνεχίσω;"
 
-#: ../rpmdrake:1541
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Ήδη υπάρχοντα μέσα αναβάθμισης"
 
-#: ../rpmdrake:1542
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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,12 +1983,13 @@ msgstr ""
 "\n"
 "Μετά, επανεκκινήστε το %s."
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Πως να επιλέξετε μόνοι σας την εναλλακτική διεύθυνση σας"
 
-#: ../rpmdrake:1554
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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,67 +2003,73 @@ msgstr ""
 "\n"
 "Μετά, επανεκκινήστε το %s."
 
-#: ../rpmdrake:1567
-#, fuzzy
+#: ../rpmdrake:1570
+#, fuzzy, c-format
 msgid "Reading updates description"
 msgstr "στις περιγραφές"
 
-#: ../rpmdrake:1593 ../rpmdrake:1670
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Παρακαλώ περιμένετε, αναζητούνται τα διαθέσιμα πακέτα..."
 
-#: ../rpmdrake:1601
-#, fuzzy
+#: ../rpmdrake:1604
+#, fuzzy, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Παρακαλώ περιμένετε, ταξινομούνται τα πακέτα"
 
-#: ../rpmdrake:1637
-#, fuzzy
+#: ../rpmdrake:1640
+#, fuzzy, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Παρακαλώ περιμένετε, αναζητούνται τα διαθέσιμα πακέτα..."
 
-#: ../rpmdrake:1771
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Ελέγχεται το %s"
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "αλλαγές:"
 
-#: ../rpmdrake:1780
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Αφαίρεση.%s"
 
-#: ../rpmdrake:1784
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Χρήση του .%s ως κύριο αρχείο"
 
-#: ../rpmdrake:1788
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Να μη γίνει τίποτα"
 
-#: ../rpmdrake:1804
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Η εγκατάσταση τελείωσε"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Έλεγχος..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1852 ../rpmdrake:2045
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Όλα τα ζητηθέντα πακέτα εγκαταστάθηκαν επιτυχώς."
 
-#: ../rpmdrake:1856 ../rpmdrake:2025
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Πρόβλημα κατά την εγκατάσταση"
 
-#: ../rpmdrake:1857 ../rpmdrake:2026 ../rpmdrake:2084
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1783,17 +2079,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1876
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Αδύνατη η λήψη των πηγαίων πακέτων."
 
-#: ../rpmdrake:1877
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Αδυναμία λήψης πηγαίων πακέτων, συγνώμη. %s"
 
-#: ../rpmdrake:1878 ../rpmdrake:1976
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1805,61 +2102,85 @@ msgstr ""
 "Αναφερθέντα σφάλματα:\n"
 "%s"
 
-#: ../rpmdrake:1894
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, τα ακόλουθα πακέτα %d πρέπει να "
+"εγκατασταθούν:\n"
+"%s\n"
+msgstr[1] ""
 "Για να ικανοποιηθούν οι εξαρτήσεις, τα ακόλουθα πακέτα %d πρέπει να "
 "εγκατασταθούν:\n"
 "%s\n"
 
-#: ../rpmdrake:1898
-#, fuzzy, perl-format
-msgid "Remove %d packages?"
-msgstr "Αφαίρεση ενός κλειδιού"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Αφαίρεση ενός κλειδιού"
+msgstr[1] "Αφαίρεση ενός κλειδιού"
 
-#: ../rpmdrake:1899
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Να συνεχιστεί;"
+msgstr[1] ""
 "Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
 "\n"
 "%s\n"
 "\n"
 "Να συνεχιστεί;"
 
-#: ../rpmdrake:1941
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Να συνεχιστεί;"
+
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Αλλαγή μέσου"
 
-#: ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Παρακαλώ εισάγετε το μέσο με όνομα \"%s\" στη συσκευή [%s]"
 
-#: ../rpmdrake:1927
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Γίνεται η λήψη του πακέτου `%s' (%s/%s)..."
 
-#: ../rpmdrake:1947
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Επαλήθευση υπογραφών πακέτων..."
 
-#: ../rpmdrake:1960 ../rpmdrake.pm:737 ../rpmdrake.pm:846
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: ../rpmdrake:1961
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1873,12 +2194,13 @@ msgstr ""
 "\n"
 "Θέλετε να συνεχιστεί η εγκατάσταση;"
 
-#: ../rpmdrake:1973 ../rpmdrake:2083
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../rpmdrake:1974
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1890,25 +2212,28 @@ msgstr ""
 "\n"
 "Ίσως να πρέπει να αναβαθμίσετε την βάση δεδομένων των μέσων."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Προετοιμασία πακέτων για εγκατάσταση..."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Προετοιμασία..."
 
-#: ../rpmdrake:1991
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
 
-#: ../rpmdrake:2006
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "αδυναμία πρόσβασης στο αρχείο rpm [%s]"
 
-#: ../rpmdrake:2040
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1920,43 +2245,48 @@ msgstr ""
 "Ορισμένα αρχεία ρυθμίσεων δημιουργήθηκαν ως `.rpmnew' ή`.rpmsave',\n"
 "ίσως πρέπει να ελέγξετε μερικά για να εκτελέσετε ορισμένες ενέργειες:"
 
-#: ../rpmdrake:2048
-#, fuzzy
+#: ../rpmdrake:2073
+#, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "Κανονικές πληροφορίες"
 
-#: ../rpmdrake:2050
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Αυτά τα πακέτα διαθέτουν πληροφορία αναβάθμισης"
 
-#: ../rpmdrake:2058
-#, fuzzy
+#: ../rpmdrake:2083
+#, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "Περισσότερες πληροφορίες για το πακέτο..."
 
-#: ../rpmdrake:2061
-#, fuzzy, perl-format
+#: ../rpmdrake:2086
+#, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "Περισσότερες πληροφορίες για το πακέτο...[%s]"
 
-#: ../rpmdrake:2073 ../rpmdrake.pm:724 ../rpmdrake.pm:805 ../rpmdrake.pm:829
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: ../rpmdrake:2074
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Μη επανακτήσιμο σφάλμα: δεν βρέθηκε πακέτο για εγκατάσταση, λυπάμαι."
 
-#: ../rpmdrake:2099
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Παρακαλώ περιμένετε, αφαιρούνται τα πακέτα..."
 
-#: ../rpmdrake:2110
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Πρόβλημα κατά την αφαίρεση"
 
-#: ../rpmdrake:2111
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1966,11 +2296,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2143
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Καλώς Ορίσατε"
 
-#: ../rpmdrake:2148
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1982,8 +2314,8 @@ msgstr ""
 "Αυτό το εργαλείο θα σας βοηθήσει να επιλέξετε το πρόγραμμα που θέλετε\n"
 "να αφαιρέσετε από τον υπολογιστή σας."
 
-#: ../rpmdrake:2153
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1995,11 +2327,13 @@ msgstr ""
 "Αυτό το εργαλείο θα σας βοηθήσει να επιλέξετε τις αναβαθμίσεις που θέλετε\n"
 "να εγκαταστήσετε στον υπολογιστή σας."
 
-#: ../rpmdrake:2158
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Καλώς ήρθατε στο εργαλείο εγκατάστασης λογισμικού"
 
-#: ../rpmdrake:2159
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -2013,171 +2347,213 @@ msgstr ""
 "Αυτό το εργαλείο θα σας βοηθήσει να επιλέξετε το πρόγραμμα που θέλετε\n"
 "να εγκαταστήσετε στον υπολογιστή σας."
 
-#: ../rpmdrake.pm:103
-msgid "Mandriva Linux Update"
-msgstr "Αναβάθμιση Mandriva Linux "
-
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Αναβάθμιση Λογισμικού"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Αναβάθμιση Mandriva Linux "
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Παρακαλώ εισάγετε  πιστοποίηση για πρόσβαση διαμεσολαβητή\n"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Όνομα χρήστη:"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Αφαίρεση Πακέτων Λογισμικού"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Αναβάθμιση Πακέτων Λογισμικού"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Εγκατάσταση Πακέτων Λογισμικού"
 
-#: ../rpmdrake.pm:218
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Όχι"
 
-#: ../rpmdrake.pm:222
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Ναι"
 
-#: ../rpmdrake.pm:272
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Πληροφορίες..."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Αυστρία"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Αυστραλία"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Βέλγιο"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Βραζιλία"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Καναδάς"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Ελβετία"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Κόστα Ρίκα"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Τσεχία"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Γερμανία"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Δανία"
 
-#: ../rpmdrake.pm:399 ../rpmdrake.pm:403
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Ελλάδα"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Ισπανία"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Φινλανδία"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Γαλλία"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Ουγγαρία"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Ισραήλ"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Ιταλία"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Ιαπωνία"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Κορέα"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Ολλανδία"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Νορβηγία"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Πολωνία"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Πορτογαλία"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Ρωσία"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Σουηδία"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Σιγγαπούρη"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Σλοβακία"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Ταϊβάν"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Ηνωμένο Βασίλειο"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Κίνα"
 
-#: ../rpmdrake.pm:420 ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Ηνωμένες Πολιτείες Αμερικής"
 
-#: ../rpmdrake.pm:520
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2190,7 +2566,8 @@ msgstr ""
 "\n"
 "Να συνεχίσω;"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2203,28 +2580,30 @@ msgstr ""
 "\n"
 "Να συνεχίσω;"
 
-#: ../rpmdrake.pm:530 ../rpmdrake.pm:568
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s επιλογές"
 
-#: ../rpmdrake.pm:533
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Παρακαλώ περιμένετε, γίνεται η λήψη των εναλλακτικών διευθύνσεων."
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Παρακαλώ περιμένετε γίνεται η λήψη των διευθύνσεων των εναλλακτικών θέσεων "
 "από την ιστοσελίδα της Mandriva."
 
-#. - seems that value is bitten before being printed by next func..
-#: ../rpmdrake.pm:541
+#: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Σφάλμα κατά τη λήψη"
 
-#: ../rpmdrake.pm:543
-#, perl-format
+#: ../rpmdrake.pm:544
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2238,8 +2617,8 @@ msgstr ""
 "Το δίκτυο ή η ιστοσελίδα μπορεί να μην είναι διαθέσιμα.\n"
 "Παρακαλώ προσπαθήστε ξανά αργότερα."
 
-#: ../rpmdrake.pm:548
-#, perl-format
+#: ../rpmdrake.pm:549
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2253,15 +2632,18 @@ msgstr ""
 "Το δίκτυο ή η ιστοσελίδα της Mandriva μπορεί να μην είναι διαθέσιμη.\n"
 "Παρακαλώ προσπαθήστε ξανά αργότερα."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Χωρίς εναλλακτικές διευθύνσεις"
 
-#: ../rpmdrake.pm:560
+#: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Δεν μπορώ να βρω κατάλληλη εναλλακτική διεύθυνση"
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2276,64 +2658,69 @@ msgstr ""
 "η αρχιτεκτονική του επεξεργαστή σας από τις επίσημες αναβαθμίσεις της\n"
 "Mandriva Linux"
 
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Παρακαλώ επιλέξτε την επιθυμητή εναλλακτική."
 
-#: ../rpmdrake.pm:633
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Αντιγραφή αρχείου από το μέσο `%s'..."
 
-#: ../rpmdrake.pm:636
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Εξέταση αρχείο από το μέσο `%s'..."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Εξέταση απομακρισμένου αρχείου του μέσου `%s'..."
 
-#: ../rpmdrake.pm:643
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " τέλος."
 
-#: ../rpmdrake.pm:647
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " απέτυχε!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:651
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s για το μέσο %s"
 
-#: ../rpmdrake.pm:655
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Εκκίνηση λήψης του `%s'..."
 
-#: ../rpmdrake.pm:659
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Λήψη του `%s', χρόνος που απομένει:%s, ταχύτητα:%s"
 
-#: ../rpmdrake.pm:662
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Λήψη του `%s', ταχύτητα:%s"
 
-#: ../rpmdrake.pm:673
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Παρακαλώ περιμένετε, ανανεώνεται το μέσο..."
 
-#: ../rpmdrake.pm:700
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Σφάλμα κατά την ανάκτηση πακέτων"
 
-#: ../rpmdrake.pm:701
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2350,27 +2737,31 @@ msgstr ""
 " να το ξανά-ρυθμίσετε, είτε είναι προς το παρόν μη προσβάσιμο και πρέπει να "
 "προσπαθήσετε ξανά αργότερα."
 
-#: ../rpmdrake.pm:732
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Ανανέωση μέσων"
 
-#: ../rpmdrake.pm:737
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Δεν βρέθηκε ενεργό μέσο.Πρέπει να ενεργοποιήσετε ορισμένα μέσα για τη "
 "δυνατότητα αναβάθμισης των."
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Επιλέξτε τα μέσα που θέλετε να ανανεώσετε:"
 
-#: ../rpmdrake.pm:762
+#: ../rpmdrake.pm:764
+#, c-format
 msgid "Update"
 msgstr "Ανανέωση"
 
-#: ../rpmdrake.pm:783
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2381,8 +2772,8 @@ msgstr ""
 "Σφάλματα:\n"
 "%s"
 
-#: ../rpmdrake.pm:806 ../rpmdrake.pm:817
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2392,16 +2783,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:829
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Αδυναμία δημιουργίας μέσου."
 
-#: ../rpmdrake.pm:834
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Αποτυχία κατά την προσθήκη μέσου"
 
-#: ../rpmdrake.pm:835
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2411,8 +2804,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:848
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2422,8 +2815,8 @@ msgstr ""
 "έκδοση του %s που εκτελείτε (%s).\n"
 "Θα απενεργοποιηθεί "
 
-#: ../rpmdrake.pm:851
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2433,11 +2826,13 @@ msgstr ""
 "εκτελούμενη έκδοση της Mandriva Linux (%s).\n"
 "Θα απενεργοποιηθεί "
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Η βοήθεια ξεκίνησε στο παρασκήνιο"
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2724,9 +3119,6 @@ msgstr "Διαχειριστής Μέσων Λογισμικού"
 #~ msgid "No package found for installation."
 #~ msgstr "Δεν βρέθηκε πακέτο για εγκατάσταση."
 
-#~ msgid "Stop"
-#~ msgstr "Τερματισμός"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "Ολα τα πακέτα βάση χώρου απόθεσης μέσου"
 
diff --git a/po/et.po b/po/et.po
index 1bfa6617..fe6c1a34 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 09:56+0100\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-12-05 20:06+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,12 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Andmekandja tüübi valimine"
 
 #: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -45,15 +48,17 @@ msgstr ""
 "(Teil on võimalik lisada ka mõlemad, kuid seda tuleb teha eraldi sammudena.)"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Distributsiooniallikad"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Ametlikud uuendused"
 
 #: ../edit-urpm-sources.pl:97
-#, perl-format
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -71,85 +76,104 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#. because updates media do not provide media.cfg yet
 #: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Palun oodake, lisatakse andmekandja..."
 
 #: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Allika lisamine"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Kohalikud failid"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Otsingutee:"
 
 #: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP-server"
 
 #: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:416
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
 #: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC-server"
 
 #: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP-server"
 
 #: ../edit-urpm-sources.pl:150
-msgid "Path or mount point:"
-msgstr "Otsingutee või haakepunkt:"
-
-#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Eemaldatav seade"
 
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Otsingutee või haakepunkt:"
+
 #: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Sirvi..."
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Kasutajatunnus:"
 
-#: ../edit-urpm-sources.pl:197 ../edit-urpm-sources.pl:501 ../rpmdrake.pm:131
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../edit-urpm-sources.pl:202 ../edit-urpm-sources.pl:417
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Suhteline tee sünteesi/hdlist faili juurde:"
 
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:209
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../edit-urpm-sources.pl:217
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Andmekandja loomine kogu distributsioonile"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Uuenduste otsimine sellelt andmekandjalt"
 
-#: ../edit-urpm-sources.pl:238
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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:242
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -157,113 +181,132 @@ msgstr ""
 "Sellise nimega andmekandja on juba olemas,\n"
 "kas soovite tõesti selle asendada?"
 
-#: ../edit-urpm-sources.pl:253
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Allika lisamine:"
 
-#: ../edit-urpm-sources.pl:255
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Andmekandja tüüp:"
 
-#: ../edit-urpm-sources.pl:263 ../edit-urpm-sources.pl:338
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:453
-#: ../edit-urpm-sources.pl:518 ../edit-urpm-sources.pl:600
-#: ../edit-urpm-sources.pl:640 ../edit-urpm-sources.pl:698
-#: ../edit-urpm-sources.pl:837 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:1921 ../rpmdrake:1929 ../rpmdrake.pm:287 ../rpmdrake.pm:596
-#: ../rpmdrake.pm:681 ../rpmdrake.pm:754
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../edit-urpm-sources.pl:265 ../edit-urpm-sources.pl:340
-#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:508
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:639
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:763
-#: ../edit-urpm-sources.pl:830 ../edit-urpm-sources.pl:883
-#: ../edit-urpm-sources.pl:1032 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:977 ../rpmdrake:982 ../rpmdrake:1827 ../rpmdrake:1921
-#: ../rpmdrake:2068 ../rpmdrake.pm:122 ../rpmdrake.pm:227 ../rpmdrake.pm:289
-#: ../rpmdrake.pm:596
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Paigaldamise globaalsed valikud"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "alati"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "mitte kunagi"
 
-#: ../edit-urpm-sources.pl:334
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Paigaldatavate RPM-pakettide kontroll:"
 
-#: ../edit-urpm-sources.pl:335
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Kasutatav allalaadimisprogramm:"
 
-#: ../edit-urpm-sources.pl:365
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Allika eemaldamine"
 
-#: ../edit-urpm-sources.pl:366
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Kas tõesti eemaldada allikas \"%s\"?"
 
-#: ../edit-urpm-sources.pl:371
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Palun oodake, eemaldan andmekandja..."
 
-#: ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Allika muutmine"
 
-#: ../edit-urpm-sources.pl:413
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Allika \"%s\" muutmine:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
 msgid "Downloader:"
 msgstr "Allalaadija:"
 
-#: ../edit-urpm-sources.pl:430
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Salvesta muutused"
 
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:1019
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Puhverserver..."
 
-#: ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Jätkamiseks tuleb sisestada andmekandja"
 
-#: ../edit-urpm-sources.pl:452
+#: ../edit-urpm-sources.pl:450
+#, 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:473
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Puhverserveri seadistamine"
 
-#: ../edit-urpm-sources.pl:484
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Andmekandja \"%s\" puhverserveri seadistused"
 
-#: ../edit-urpm-sources.pl:485
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Globaalsed puhverserveri seadistused"
 
-#: ../edit-urpm-sources.pl:487
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -271,143 +314,173 @@ msgstr ""
 "Kui vajate puhverserverit, sisestage masina nimi ja võimalusel port "
 "(süntaks: <puhverserver[:port]>):"
 
-#: ../edit-urpm-sources.pl:490
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Puhverserveri masinanimi:"
 
-#: ../edit-urpm-sources.pl:493
+#: ../edit-urpm-sources.pl:491
+#, 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:496
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Kasutajanimi:"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Paralleelgrupi lisamine"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Paralleelgrupi muutmine"
 
-#: ../edit-urpm-sources.pl:579
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Andmekandja limiidi lisamine"
 
-#: ../edit-urpm-sources.pl:591
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Valige andmekandja andmekandjate limiiti lisamiseks:"
 
-#: ../edit-urpm-sources.pl:628
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Serveri lisamine"
 
-#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:632
+#, 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:665
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Paralleelgrupi \"%s\" muutmine:"
 
-#: ../edit-urpm-sources.pl:669
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Grupi nimi:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../edit-urpm-sources.pl:672
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Andmekandja limiit:"
 
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Lisa"
 
-#: ../edit-urpm-sources.pl:678 ../edit-urpm-sources.pl:685
-#: ../edit-urpm-sources.pl:743 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Eemalda"
 
-#: ../edit-urpm-sources.pl:679
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Serverid:"
 
-#: ../edit-urpm-sources.pl:713
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Paralleel-uprmi seadistamine (urpmi jagatud käivitamine)"
 
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grupp"
 
-#: ../edit-urpm-sources.pl:716
-msgid "Media limit"
-msgstr "Andmekandjate limiit"
-
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../edit-urpm-sources.pl:717
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Andmekandjate limiit"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Käsk"
 
-#: ../edit-urpm-sources.pl:727 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:886 ../rpmdrake:1748
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(puudub)"
 
-#: ../edit-urpm-sources.pl:747 ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Muuda..."
 
-#: ../edit-urpm-sources.pl:755 ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Lisa..."
 
-#: ../edit-urpm-sources.pl:771
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Pakettide digitaalsignatuuride võtmete haldamine"
 
-#: ../edit-urpm-sources.pl:775 ../edit-urpm-sources.pl:932
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Andmekandja"
 
 #: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Võtmed"
 
-#: ../edit-urpm-sources.pl:799
+#: ../edit-urpm-sources.pl:803
+#, 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:812
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Võtme lisamine"
 
-#: ../edit-urpm-sources.pl:824
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Võtme valimine andmekandjale %s lisamiseks"
 
-#: ../edit-urpm-sources.pl:833
+#: ../edit-urpm-sources.pl:834
+#, c-format
 msgid "Close"
 msgstr "Sulge"
 
-#: ../edit-urpm-sources.pl:855
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Võtme eemaldamine"
 
-#: ../edit-urpm-sources.pl:853
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -415,32 +488,38 @@ msgstr ""
 "Kas tõesti eemaldada võti %s andmekandjalt %s?\n"
 "(võtme nimi: %s)"
 
-#: ../edit-urpm-sources.pl:871
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Lisa võti..."
 
-#: ../edit-urpm-sources.pl:875
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Eemalda võti"
 
-#: ../edit-urpm-sources.pl:891
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Allikate seadistamine"
 
-#: ../edit-urpm-sources.pl:930
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Kas lubada?"
 
-#: ../edit-urpm-sources.pl:931
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Uuendused?"
 
-#: ../edit-urpm-sources.pl:947
+#: ../edit-urpm-sources.pl:951
+#, c-format
 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:977
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -450,32 +529,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1011
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Lisa omaloodud..."
 
-#: ../edit-urpm-sources.pl:1015
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Uuenda..."
 
-#: ../edit-urpm-sources.pl:1018
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Võtmete haldamine"
 
-#: ../edit-urpm-sources.pl:1020
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paralleel..."
 
-#: ../edit-urpm-sources.pl:1021
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Globaalsed valikud..."
 
-#: ../edit-urpm-sources.pl:1031 ../rpmdrake:1428
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Abi"
 
-#: ../edit-urpm-sources.pl:1047 ../gurpmi.addmedia:98 ../rpmdrake:2144
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -485,7 +570,8 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../edit-urpm-sources.pl:1050
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -499,7 +585,8 @@ 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:1063
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -512,11 +599,12 @@ msgstr ""
 "paigaldate parajasti mingeid tarkvarapakette?)"
 
 #: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Andmekandja lisamine ebaõnnestus, argumendid olid vigased või puudu"
 
 #: ../gurpmi.addmedia:102
-#, perl-format
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -527,7 +615,7 @@ msgstr ""
 "süsteemi uut tarkvara paigaldama."
 
 #: ../gurpmi.addmedia:105
-#, perl-format
+#, c-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"
@@ -538,21 +626,22 @@ msgstr ""
 "süsteemi uut tarkvara paigaldama."
 
 #: ../gurpmi.addmedia:130
-#, perl-format
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Andmekandja %s edukalt lisatud."
 
 #: ../gurpmi.addmedia:131
-#, perl-format
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Andmekandja %s edukalt lisatud."
 
 #: ../rpmdrake:39
-#, perl-format
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Kasutamine: %s [VÕTI]..."
 
 #: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -561,22 +650,26 @@ msgstr ""
 "failide nimekirja"
 
 #: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     piirdumine määratud andmekandjaga"
 
 #: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     kõigi leitud .rpmnew/.rpmsave-failide ühendamine"
 
 #: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            režiimi määramine (paigaldamine (vaikimisi), "
 "eemaldamine, uuendamine)"
 
 #: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
@@ -584,14 +677,17 @@ msgstr ""
 "kinnituseküsimust"
 
 #: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      käivitamisel ei uuendata andmekandjat"
 
 #: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        pakettide signatuure ei kontrollita"
 
 #: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -600,26 +696,32 @@ msgstr ""
 "kasutades masinat \"host\" vajalike sõltuvuste näitamiseks"
 
 #: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    näidatakse ainult määratud pakette"
 
 #: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      määratud pakettide eelvalimine"
 
 #: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 sunnitakse töötama administraatori õigustes"
 
 #: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           otsitakse paketti \"pkg\""
 
 #: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Töötamine kasutaja õigustega"
 
 #: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -630,70 +732,86 @@ msgstr ""
 "kuid võite siiski sirvida olemasolevat andmebaasi."
 
 #: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Hõlbustus"
 
 #: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
 #: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arhiveerimine"
 
 #: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Varundamine"
 
 #: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD-de kirjutamine"
 
 #: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Tihendamine"
 
 #: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
 #: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
 #: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Muu"
 
 #: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
 #: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Raamatud"
 
 #: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Arvutiraamatud"
 
 #: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "KKK"
 
 #: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "HOWTO"
 
 #: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Kirjandus"
 
 #: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Klaster"
 
 #: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Teateedastus"
 
 #: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Järjekorrateenused"
 
 #: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Kommunikatsioon"
 
 #: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Andmebaasid"
 
@@ -701,245 +819,302 @@ msgstr "Andmebaasid"
 #: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
 #: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Arendus"
 
 #: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
 #: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
 #: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ja GTK+"
 
 #: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
 #: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE ja Qt"
 
 #: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
 #: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
 #: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
 #: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
 #: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Redaktorid"
 
 #: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Haridus"
 
 #: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulaatorid"
 
 #: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Failitööriistad"
 
 #: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
 #: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
 #: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Mängud"
 
 #: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Seiklusmängud"
 
 #: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Võitlusmängud"
 
 #: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Lauamängud"
 
 #: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kaardimängud"
 
 #: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Pusled"
 
 #: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sport"
 
 #: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strateegia"
 
 #: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
 #: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
 #: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Graafiline töölaud"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "IceWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
 #: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Graafika"
 
 #: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Monitooring"
 
 #: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimeedia"
 
 #: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
 #: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
 #: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
 #: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Võrk"
 
 #: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
 #: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Failiedastus"
 
 #: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
 #: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Kiirsuhtlus"
 
 #: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "E-post"
 
 #: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Uudised"
 
 #: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Kaugligipääs"
 
 #: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
 #: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Kontoritöö"
 
 #: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Avalikud võtmed"
 
 #: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publitseerimine"
 
 #: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
 #: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
 #: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Teadus"
 
 #: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronoomia"
 
 #: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Bioloogia"
 
 #: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Keemia"
 
 #: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Arvutiteadus"
 
 #: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geograafia"
 
 #: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matemaatika"
 
 #: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Füüsika"
 
 #: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shellid"
 
 #: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Heli"
 
@@ -949,315 +1124,392 @@ msgstr "Heli"
 #: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
 #: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
 #: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Süsteem"
 
 #: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Baas"
 
 #: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
 #: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Seadistamine"
 
 #: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Algkäivitus"
 
 #: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Riistvara"
 
 #: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Paketindus"
 
 #: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Trükkimine"
 
 #: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Jaosvõrk"
 
 #: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Jaosvõrk"
 
 #: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
 #: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Fondid"
 
 #: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsool"
 
 #: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True Type"
 
 #: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
 #: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11"
 
 #: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internatsionaliseerimine"
 
 #: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel ja riistvara"
 
 #: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Teegid"
 
 #: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Serverid"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
 #: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminalid"
 
 #: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Tekstitööriistad"
 
 #: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Mänguasjad"
 
-#. for Mandriva Choice:
 #: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
 #: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
 #: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
 msgid "Workstation"
 msgstr "Tööjaam"
 
 #: ../rpmdrake:339
+#, c-format
 msgid "Console Tools"
 msgstr "Konsoolitööriistad"
 
 #: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
 #: ../rpmdrake:341
+#, c-format
 msgid "Game station"
 msgstr "Mänguarvuti"
 
 #: ../rpmdrake:342
+#, c-format
 msgid "Internet station"
 msgstr "Internetiarvuti"
 
 #: ../rpmdrake:343
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimeediaarvuti"
 
 #: ../rpmdrake:344
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Võrguarvuti (klient)"
 
 #: ../rpmdrake:345
+#, c-format
 msgid "Office Workstation"
 msgstr "Kontoriarvuti"
 
 #: ../rpmdrake:346
+#, c-format
 msgid "Scientific Workstation"
 msgstr "Teadusarvuti"
 
 #: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
 #: ../rpmdrake:352
+#, c-format
 msgid "Graphical Environment"
 msgstr "Graafiline keskkond"
 
 #: ../rpmdrake:349
+#, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME tööjaam"
 
 #: ../rpmdrake:350
+#, c-format
 msgid "IceWm Desktop"
 msgstr "IceWM töölaud"
 
 #: ../rpmdrake:351
+#, c-format
 msgid "KDE Workstation"
 msgstr "KDE tööjaam"
 
 #: ../rpmdrake:352
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Teised graafilised töölauad"
 
 #: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
 #: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
 msgid "Server"
 msgstr "Server"
 
 #: ../rpmdrake:357
+#, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
 #: ../rpmdrake:358
+#, c-format
 msgid "Database"
 msgstr "Andmebaas"
 
 #: ../rpmdrake:359
+#, c-format
 msgid "Firewall/Router"
 msgstr "Tulemüür/ruuter"
 
 #: ../rpmdrake:361
+#, c-format
 msgid "Mail/Groupware/News"
 msgstr "E-post/grupitöö/uudised"
 
 #: ../rpmdrake:362
+#, c-format
 msgid "Network Computer server"
 msgstr "Võrguarvuti (server)"
 
 #: ../rpmdrake:363
+#, c-format
 msgid "Web/FTP"
 msgstr "Veeb/FTP"
 
-#. - to highlight information
-#: ../rpmdrake:502 ../rpmdrake:707 ../rpmdrake:712 ../rpmdrake:726
-#: ../rpmdrake:728
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(kättesaamatu)"
 
-#: ../rpmdrake:534
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Otsingu tulemused"
 
 #: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Otsingu tulemus (ei leitud)"
 
-#: ../rpmdrake:545 ../rpmdrake:2125
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Palun oodake, otsitakse..."
 
-#: ../rpmdrake:617 ../rpmdrake:921
-msgid "Addable"
-msgstr "Lisatavad"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Tarkvarahaldur"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr ""
 
-#: ../rpmdrake:617 ../rpmdrake:921
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Uuendatavad"
 
-#: ../rpmdrake:619
-msgid "Not selected"
-msgstr "Valimata"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Lisatavad"
 
 #: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Valitud"
 
-#. is it an update?
-#: ../rpmdrake:687 ../rpmdrake:744
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Valimata"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Tähtsus: "
 
-#: ../rpmdrake:688 ../rpmdrake:752
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Uuendamise põhjus: "
 
-#: ../rpmdrake:692
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Turvanõuanne"
 
-#: ../rpmdrake:700 ../rpmdrake:754
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Kirjeldus puudub"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Failid:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Muutuste logi:"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Failid:\n"
 
-#: ../rpmdrake:728
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Muutuste logi:\n"
 
-#: ../rpmdrake:733 ../rpmdrake.pm:807
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Andmekandja: "
 
-#: ../rpmdrake:734
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Praegu paigaldatud versioon: "
 
-#: ../rpmdrake:738
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Nimi: "
 
-#: ../rpmdrake:739
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versioon: "
 
-#: ../rpmdrake:740
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Arhitektuur: "
 
-#: ../rpmdrake:741
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:741
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Suurus: "
 
-#. extra empty line
-#: ../rpmdrake:748
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Kokkuvõte: "
 
-#: ../rpmdrake:754
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Kirjeldus: "
 
-#: ../rpmdrake:810 ../rpmdrake.pm:179
-msgid "Software Management"
-msgstr "Tarkvarahaldur"
-
-#: ../rpmdrake:827 ../rpmdrake:973 ../rpmdrake:975
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Rohkem infot paketi kohta..."
 
-#: ../rpmdrake:829
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on üks järgmistest pakettidest:"
-
-#: ../rpmdrake:829
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Palun valige"
 
-#: ../rpmdrake:870
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Vajalik on üks järgmistest pakettidest:"
+msgstr[1] "Vajalik on üks järgmistest pakettidest:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Palun oodake, koostatakse nimekirja..."
 
-#: ../rpmdrake:888
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Uuendusi ei ole"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1267,34 +1519,41 @@ msgstr ""
 "paigaldatud pakettidele ei ole parajasti mingeid uuendusi või\n"
 "Te olete need juba kõik paigaldanud."
 
-#: ../rpmdrake:912 ../rpmdrake:1174
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Kõik"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:960 ../rpmdrake:965
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Rohkem infot"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Info pakettide kohta"
 
-#: ../rpmdrake:991
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
 
-#: ../rpmdrake:992
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:"
 
-#: ../rpmdrake:998 ../rpmdrake:1007
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Mõnda paketti ei saa eemaldada"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1302,7 +1561,8 @@ msgstr ""
 "Vabandust, nende pakettide eemaldamine võib halvata Teie süsteemi:\n"
 "\n"
 
-#: ../rpmdrake:1008 ../rpmdrake:1073
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1311,11 +1571,13 @@ msgstr ""
 "Sõltuvuste tõttu ei saa järgmisi pakette valida:\n"
 "\n"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Vajalikud lisapaketid"
 
-#: ../rpmdrake:1038
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1324,134 +1586,164 @@ msgstr ""
 "Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
 "\n"
 
-#: ../rpmdrake:1053
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (kuulub vahelejäetavate hulka)"
 
-#: ../rpmdrake:1056
-msgid "Some packages can't be installed"
-msgstr "Mõnda paketti ei saa paigaldada"
-
-#: ../rpmdrake:1057
-#, perl-format
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Mõnda paketti ei saa paigaldada"
+msgstr[1] "Mõnda paketti ei saa paigaldada"
+
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Kahjuks ei saa järgmisi pakette valida:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Kahjuks ei saa järgmisi pakette valida:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:1072 ../rpmdrake:1896
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Mõned paketid tuleb eemaldada"
 
-#: ../rpmdrake:1101
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Valitud: %s / Vaba kettaruumi %s"
 
-#: ../rpmdrake:1102
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Valitud pakettide maht: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:1107
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Sellel paketil pole kirjeldust\n"
 
-#: ../rpmdrake:1113 ../rpmdrake:1506
-#, perl-format
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Tekkis saatuslik viga: %s."
 
-#: ../rpmdrake:1174
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Paigaldatud"
 
-#: ../rpmdrake:1174
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Paigaldamata"
 
-#: ../rpmdrake:1175
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s valikud"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linuxi valikud"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1177
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Kõik paketid tähestikuliselt"
 
-#: ../rpmdrake:1178
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Kõik paketid uuendamisstaatuse järgi"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Kõik paketid suuruse järgi"
 
-#: ../rpmdrake:1180
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Kõik paketid valikustaatuse järgi"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Ainult sõltuvusteta paketid paigaldusaja järgi"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Kõik paketid grupi järgi"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Kõik uuendused"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Turvaparandused"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Veaparandused"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Tavalised uuendused"
 
-#: ../rpmdrake:1184
-msgid "Security updates"
-msgstr "Turvaparandused"
-
-#: ../rpmdrake:1247
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "nimedes"
 
-#: ../rpmdrake:1249
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "kirjeldustes"
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "failinimedes"
 
-#: ../rpmdrake:1278
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Viga: %s paistab olevat haagitud ainult loetavana."
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Kõigepealt tuleb mõned paketid valida."
 
-#: ../rpmdrake:1287
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Valitud on liiga palju pakette"
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1285
+#, 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"
@@ -1467,142 +1759,173 @@ msgstr ""
 "\n"
 "Kas soovite tõesti paigaldada kõik valitud paketid?"
 
-#: ../rpmdrake:1320 ../rpmdrake:1323 ../rpmdrake:1334 ../rpmdrake:1347
-#: ../rpmdrake:1356
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Fail"
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Uuenda allikaid"
 
-#: ../rpmdrake:1334
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Lähtesta valik"
 
-#: ../rpmdrake:1347
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Laadi _pakettide nimekiri uuesti"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Välju"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1359 ../rpmdrake:1360 ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Seadistused"
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/And_mekandjate haldur"
 
-#: ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/A_utomaatselt valitud pakettide näitamine"
 
-#: ../rpmdrake:1367 ../rpmdrake:1368 ../rpmdrake:1369 ../rpmdrake:1370
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/Saada vea_raport"
 
-#: ../rpmdrake:1370
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Info..."
 
-#. nicer formatting
-#: ../rpmdrake:1373
+#: ../rpmdrake:1370
+#, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:1375
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autoriõigus (C) %s: Mandriva"
 
-#: ../rpmdrake:1377
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake on Mandriva Linuxi tarkvarahaldur."
 
-#: ../rpmdrake:1379
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1384
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Marek Laane <bald@starman.ee>\n"
 
-#: ../rpmdrake:1408
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Otsimine:"
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Otsi"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Puhasta"
 
-#: ../rpmdrake:1433 ../rpmdrake.pm:758
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
 msgid "Select all"
 msgstr "Vali kõik"
 
-#: ../rpmdrake:1440
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Rakenda"
 
-#: ../rpmdrake:1444
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Välju"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Kiire sissejuhatus"
 
-#: ../rpmdrake:1461
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "Tarkvarapakette saab sirvida vasakul kategooriapuus."
 
-#: ../rpmdrake:1462
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr "Tarkvarapakettide infot näeb neile klõpsates parempoolses nimekirjas."
 
-#: ../rpmdrake:1463
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "Tarkvarapaketi paigaldamiseks, uuendamiseks või eemaldamiseks märkige "
 "lihtsalt kastike."
 
 #: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Saatuslik viga"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
-msgid "Initializing..."
-msgstr "Initsialiseerimine..."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Palun oodake"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
 msgid "Package installation..."
 msgstr "Paigaldamine..."
 
-#: ../rpmdrake:1507 ../rpmdrake:1932 ../rpmdrake.pm:311
-msgid "Please wait"
-msgstr "Palun oodake"
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Initsialiseerimine..."
 
-#: ../rpmdrake:1530 ../rpmdrake:1918
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Kinnitus"
 
-#: ../rpmdrake:1532
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1614,12 +1937,13 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake:1541
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Olemasolevad uuenduste allikad"
 
-#: ../rpmdrake:1542
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1635,12 +1959,13 @@ msgstr ""
 "\n"
 "Seejärel käivitage %s uuesti."
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kuidas valida peegel käsitsi"
 
-#: ../rpmdrake:1554
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1654,64 +1979,73 @@ msgstr ""
 "\n"
 "Seejärel taaskäivitage %s."
 
-#: ../rpmdrake:1567
+#: ../rpmdrake:1570
+#, c-format
 msgid "Reading updates description"
 msgstr "Uuenduste kirjelduste lugemine"
 
-#: ../rpmdrake:1593 ../rpmdrake:1670
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Palun oodake, otsitakse kättesaadavaid pakette..."
 
-#: ../rpmdrake:1601
+#: ../rpmdrake:1604
+#, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Palun oodake, koostatakse baaspakettide nimekirja..."
 
-#: ../rpmdrake:1637
+#: ../rpmdrake:1640
+#, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Palun oodake, otsitakse paigaldatud pakette..."
 
-#: ../rpmdrake:1771
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "%s uurimine"
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "muutused:"
 
-#: ../rpmdrake:1780
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Eemalda .%s"
 
-#: ../rpmdrake:1784
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Kasuta .%s põhifailina"
 
-#: ../rpmdrake:1788
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Ära tee midagi"
 
-#: ../rpmdrake:1804
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Paigaldus lõpetatud"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Uuri..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1852 ../rpmdrake:2045
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Kõik soovitud paketid said edukalt paigaldatud."
 
-#: ../rpmdrake:1856 ../rpmdrake:2025
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Paigaldusel tekkis probleem"
 
-#: ../rpmdrake:1857 ../rpmdrake:2026 ../rpmdrake:2084
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1721,17 +2055,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1876
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Pakette ei õnnestunud tõmmata."
 
-#: ../rpmdrake:1877
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Vabandust, pakette ei õnnestunud kätte saada. %s"
 
-#: ../rpmdrake:1878 ../rpmdrake:1976
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1743,60 +2078,83 @@ msgstr ""
 "Anti teada vigadest:\n"
 "%s"
 
-#: ../rpmdrake:1894
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Sõltuvuste lahendamiseks paigaldatakse järgmised %d paketti:\n"
+"%s\n"
+msgstr[1] ""
 "Sõltuvuste lahendamiseks paigaldatakse järgmised %d paketti:\n"
 "%s\n"
 
-#: ../rpmdrake:1898
-#, perl-format
-msgid "Remove %d packages?"
-msgstr "Kas eemaldada %d paketti?"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Kas eemaldada %d paketti?"
+msgstr[1] "Kas eemaldada %d paketti?"
 
-#: ../rpmdrake:1899
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Kas jätkata?"
+msgstr[1] ""
 "Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
 "\n"
 "%s\n"
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake:1941
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Kas jätkata?"
+
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Muuda andmekandjat"
 
-#: ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Palun sisestage andmekandja \"%s\" seadmesse [%s]"
 
-#: ../rpmdrake:1927
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Tõmban võrgust paketti '%s' (%s/%s)..."
 
-#: ../rpmdrake:1947
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Signatuuride kontrollimine..."
 
-#: ../rpmdrake:1960 ../rpmdrake.pm:737 ../rpmdrake.pm:846
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../rpmdrake:1961
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1810,12 +2168,13 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake:1973 ../rpmdrake:2083
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
-#: ../rpmdrake:1974
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1827,25 +2186,28 @@ msgstr ""
 "\n"
 "Võib-olla tasuks uuendada allikate andmebaasi."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Paigaldamiseks valmistumine..."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
-#: ../rpmdrake:1991
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../rpmdrake:2006
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../rpmdrake:2040
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1857,41 +2219,48 @@ 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:2048
+#: ../rpmdrake:2073
+#, c-format
 msgid "Upgrade information"
 msgstr "Uuendusinfo"
 
-#: ../rpmdrake:2050
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Neil pakettidel on uuendusinfo"
 
-#: ../rpmdrake:2058
+#: ../rpmdrake:2083
+#, c-format
 msgid "Upgrade information about this package"
 msgstr "Paketi uuendusinfo"
 
-#: ../rpmdrake:2061
-#, perl-format
+#: ../rpmdrake:2086
+#, c-format
 msgid "Upgrade information about package %s"
 msgstr "Paketi %s uuendusinfo"
 
-#: ../rpmdrake:2073 ../rpmdrake.pm:724 ../rpmdrake.pm:805 ../rpmdrake.pm:829
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Viga"
 
-#: ../rpmdrake:2074
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Parandamatu viga: kahjuks ei leitud paigaldamiseks ühtegi paketti."
 
-#: ../rpmdrake:2099
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Palun oodake, eemaldatakse pakette..."
 
-#: ../rpmdrake:2110
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Probleem eemaldamisel"
 
-#: ../rpmdrake:2111
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1901,11 +2270,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2143
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Tere tulemast"
 
-#: ../rpmdrake:2148
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1916,8 +2287,8 @@ msgstr ""
 "\n"
 "Selle tööriista abil saate valida eemaldatava tarkvara."
 
-#: ../rpmdrake:2153
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1928,11 +2299,13 @@ msgstr ""
 "\n"
 "Selle tööriista abil saate oma Mandriva Linuxit uuendada."
 
-#: ../rpmdrake:2158
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Tere tulemast kasutama tarkvara paigaldamise abivahendit!"
 
-#: ../rpmdrake:2159
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1945,171 +2318,213 @@ msgstr ""
 "Mandriva Linuxi CD või DVD sisaldab tuhandeid tarkvarapakette.\n"
 "Selle tööriista abil saate valida, millised soovite oma arvutile paigaldada."
 
-#: ../rpmdrake.pm:103
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linuxi uuendused"
-
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Tarkvara uuendamine"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linuxi uuendused"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Palun sisestage oma andmed puhverserveri kasutamiseks\n"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Kasutajanimi:"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Tarkvara eemaldamine"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Tarkvara uuendamine"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Tarkvara paigaldamine"
 
-#: ../rpmdrake.pm:218
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Ei"
 
-#: ../rpmdrake.pm:222
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Jah"
 
-#: ../rpmdrake.pm:272
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Austraalia"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Šveits"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Tšehhi Vabariik"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Taani"
 
-#: ../rpmdrake.pm:399 ../rpmdrake.pm:403
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Kreeka"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Hispaania"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Soome"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Ungari"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Iisrael"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Itaalia"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Jaapan"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norra"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Poola"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Venemaa"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Suurbritannia"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Hiina"
 
-#: ../rpmdrake.pm:420 ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "USA"
 
-#: ../rpmdrake.pm:520
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2121,7 +2536,8 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2133,25 +2549,28 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake.pm:530 ../rpmdrake.pm:568
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Peegli valik"
 
-#: ../rpmdrake.pm:533
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Palun oodake, laetakse peeglite aadresse."
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Palun oodake, laetakse peeglite aadresse Mandriva veebisaidilt."
 
-#. - seems that value is bitten before being printed by next func..
-#: ../rpmdrake.pm:541
+#: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Viga allalaadimisel"
 
-#: ../rpmdrake.pm:543
-#, perl-format
+#: ../rpmdrake.pm:544
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2165,8 +2584,8 @@ msgstr ""
 "Võrk või veebilehekülg ei pruugi olla kättesaadav.\n"
 "Palun proovige varsti uuesti."
 
-#: ../rpmdrake.pm:548
-#, perl-format
+#: ../rpmdrake.pm:549
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2180,15 +2599,18 @@ msgstr ""
 "Võrk või Mandriva veebilehekülg ei pruugi olla kättesaadav.\n"
 "Palun proovige varsti uuesti."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Peeglit ei leitud"
 
-#: ../rpmdrake.pm:560
+#: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Ühtki kõlblikku peeglit ei leitud."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2201,64 +2623,69 @@ 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:580
+#: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Palun valige peegel."
 
-#: ../rpmdrake.pm:633
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Faili kopeerimine allika `%s' jaoks..."
 
-#: ../rpmdrake.pm:636
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Allikafaili `%s' uurimine..."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Allikafaili `%s' uurimine..."
 
-#: ../rpmdrake.pm:643
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " tehtud."
 
-#: ../rpmdrake.pm:647
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " ebaõnnestus!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:651
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s andmekandjalt %s"
 
-#: ../rpmdrake.pm:655
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "'%s' allalaadimise alustamine..."
 
-#: ../rpmdrake.pm:659
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
 
-#: ../rpmdrake.pm:662
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' allalaadimine, kiirus:%s"
 
-#: ../rpmdrake.pm:673
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Palun oodake, uuendatakse andmekandjat..."
 
-#: ../rpmdrake.pm:700
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Viga pakettide hankimisel"
 
-#: ../rpmdrake.pm:701
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2274,26 +2701,30 @@ msgstr ""
 "lihtsalt ajutiselt kättesaamatu, millisel juhul võiks hiljem\n"
 "uuesti proovida nimekirja hankida."
 
-#: ../rpmdrake.pm:732
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Allikate uuendamine"
 
-#: ../rpmdrake.pm:737
+#: ../rpmdrake.pm:739
+#, c-format
 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:744
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Valige allikad, mida soovite uuendada:"
 
-#: ../rpmdrake.pm:762
+#: ../rpmdrake.pm:764
+#, c-format
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../rpmdrake.pm:783
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2305,8 +2736,8 @@ msgstr ""
 "Vead:\n"
 "%s"
 
-#: ../rpmdrake.pm:806 ../rpmdrake.pm:817
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2316,16 +2747,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:829
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Andmekandja loomine ebaõnnestus."
 
-#: ../rpmdrake.pm:834
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Viga andmekandja lisamisel"
 
-#: ../rpmdrake.pm:835
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2335,8 +2768,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:848
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2346,8 +2779,8 @@ msgstr ""
 "versiooniga (%s).\n"
 "Seepärast seda ei kasutata."
 
-#: ../rpmdrake.pm:851
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2357,11 +2790,13 @@ msgstr ""
 "Mandriva Linuxi versiooniga (%s).\n"
 "Seepärast seda ei kasutata."
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Abi käivitati taustal"
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:871
+#, c-format
 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."
diff --git a/po/eu.po b/po/eu.po
index 11d67575..ade96c17 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 09:56+0100\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +20,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Aukeratu euskarri mota"
 
 #: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -50,15 +53,17 @@ msgstr ""
 "beharko duzu)"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Banaketaren iturburuak"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Eguneraketa ofizialak"
 
 #: ../edit-urpm-sources.pl:97
-#, perl-format
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -77,85 +82,104 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#. because updates media do not provide media.cfg yet
 #: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Itxoin mesedez, euskarria eransten..."
 
 #: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Gehitu euskarria"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Fitxategi lokalak"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Bide-izena:"
 
 #: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP zerbitzaria"
 
 #: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:416
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URLa:"
 
 #: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC zerbitzaria"
 
 #: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP zerbitzaria"
 
 #: ../edit-urpm-sources.pl:150
-msgid "Path or mount point:"
-msgstr "Bide-izena edo muntatze-puntua:"
-
-#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Gailu aldagarria"
 
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Bide-izena edo muntatze-puntua:"
+
 #: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Arakatu..."
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../edit-urpm-sources.pl:197 ../edit-urpm-sources.pl:501 ../rpmdrake.pm:131
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../edit-urpm-sources.pl:202 ../edit-urpm-sources.pl:417
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "hdlist-en/laburpenaren bide-izen erlatiboa:"
 
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Hutsik utziz gero, synthesis/hdlist automatikoki bilatuko da"
 
-#: ../edit-urpm-sources.pl:209
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Izena:"
 
-#: ../edit-urpm-sources.pl:217
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Sortu euskarria banaketa oso batentzako"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Miatu euskarri hau eguneraketa bila"
 
-#: ../edit-urpm-sources.pl:238
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Gutxienez lehen bi sarrerak bete behar dituzu."
 
-#: ../edit-urpm-sources.pl:242
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -163,113 +187,132 @@ msgstr ""
 "Izen hori duen euskarria badago lehendik. Ziur zaude\n"
 "ordeztu nahi duzula?"
 
-#: ../edit-urpm-sources.pl:253
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Gehitu euskarria:"
 
-#: ../edit-urpm-sources.pl:255
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Euskarri-mota:"
 
-#: ../edit-urpm-sources.pl:263 ../edit-urpm-sources.pl:338
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:453
-#: ../edit-urpm-sources.pl:518 ../edit-urpm-sources.pl:600
-#: ../edit-urpm-sources.pl:640 ../edit-urpm-sources.pl:698
-#: ../edit-urpm-sources.pl:837 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:1921 ../rpmdrake:1929 ../rpmdrake.pm:287 ../rpmdrake.pm:596
-#: ../rpmdrake.pm:681 ../rpmdrake.pm:754
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../edit-urpm-sources.pl:265 ../edit-urpm-sources.pl:340
-#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:508
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:639
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:763
-#: ../edit-urpm-sources.pl:830 ../edit-urpm-sources.pl:883
-#: ../edit-urpm-sources.pl:1032 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:977 ../rpmdrake:982 ../rpmdrake:1827 ../rpmdrake:1921
-#: ../rpmdrake:2068 ../rpmdrake.pm:122 ../rpmdrake.pm:227 ../rpmdrake.pm:289
-#: ../rpmdrake.pm:596
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Ados"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Pakete instalaketarako aukera orokorrak"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "beti"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "inoiz ez"
 
-#: ../edit-urpm-sources.pl:334
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Egiaztatu instalatu beharreko RPMak:"
 
-#: ../edit-urpm-sources.pl:335
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Jaisteko erabili beharreko programa:"
 
-#: ../edit-urpm-sources.pl:365
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Iturburu Ezabaketa"
 
-#: ../edit-urpm-sources.pl:366
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ziur zaude \"%s\" iturburua ezabatu nahi duzula?"
 
-#: ../edit-urpm-sources.pl:371
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Itxaron, euskarria kentzen ari da..."
 
-#: ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Editatu euskarri bat"
 
-#: ../edit-urpm-sources.pl:413
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" euskarria editatzen:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
 msgid "Downloader:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:430
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Gorde aldaketak"
 
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:1019
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy-a..."
 
-#: ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Jarraitu ahal izateko, euskarria sartu behar duzu"
 
-#: ../edit-urpm-sources.pl:452
+#: ../edit-urpm-sources.pl:450
+#, 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:473
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Konfiguratu proxiak"
 
-#: ../edit-urpm-sources.pl:484
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxy ezarpenak \"%s\" euskarriarentzako"
 
-#: ../edit-urpm-sources.pl:485
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Proxy ezarpen orokorrak"
 
-#: ../edit-urpm-sources.pl:487
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -277,142 +320,172 @@ msgstr ""
 "Proxy bat behar baduzu, sartu ostalari-izena eta aukerako ataka (sintaxia: "
 "<proxyostalaria[:ataka]>):"
 
-#: ../edit-urpm-sources.pl:490
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy-aren ostalari-izena:"
 
-#: ../edit-urpm-sources.pl:493
+#: ../edit-urpm-sources.pl:491
+#, 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:496
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Erabiltzailea:"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Gehitu talde paraleloa"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Editatu talde paraleloa"
 
-#: ../edit-urpm-sources.pl:579
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Gehitu euskarriaren muga"
 
-#: ../edit-urpm-sources.pl:591
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Hautatu euskarri bat euskarrien mugan gehitzeko:"
 
-#: ../edit-urpm-sources.pl:628
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Gehitu ostalari bat"
 
-#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:632
+#, 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:665
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "\"%s\" talde paraleloa editatzen:"
 
-#: ../edit-urpm-sources.pl:669
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Taldearen izena:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokoloa:"
 
-#: ../edit-urpm-sources.pl:672
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Euskarrien muga:"
 
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Gehitu"
 
-#: ../edit-urpm-sources.pl:678 ../edit-urpm-sources.pl:685
-#: ../edit-urpm-sources.pl:743 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Kendu"
 
-#: ../edit-urpm-sources.pl:679
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Ostalariak:"
 
-#: ../edit-urpm-sources.pl:713
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfiguratu urpmi paraleloa (urpmi-ren exekutatze banatua)"
 
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Elkartu"
 
-#: ../edit-urpm-sources.pl:716
-msgid "Media limit"
-msgstr "Euskarrien muga"
-
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokoloa"
 
-#: ../edit-urpm-sources.pl:717
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Euskarrien muga"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Komandoa"
 
-#: ../edit-urpm-sources.pl:727 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:886 ../rpmdrake:1748
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: ../edit-urpm-sources.pl:747 ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Editatu..."
 
-#: ../edit-urpm-sources.pl:755 ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Gehitu..."
 
-#: ../edit-urpm-sources.pl:771
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Kudeatu paketeen sinadura digitalerako gakoak"
 
-#: ../edit-urpm-sources.pl:775 ../edit-urpm-sources.pl:932
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Tartekoa"
 
 #: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Gakoak"
 
-#: ../edit-urpm-sources.pl:799
+#: ../edit-urpm-sources.pl:803
+#, 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:812
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Gehitu gakoa"
 
-#: ../edit-urpm-sources.pl:824
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Hautatu %s euskarriari gehitu beharreko gakoa"
 
-#: ../edit-urpm-sources.pl:833
+#: ../edit-urpm-sources.pl:834
+#, c-format
 msgid "Close"
 msgstr "Itxi"
 
-#: ../edit-urpm-sources.pl:855
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Kendu gako bat"
 
-#: ../edit-urpm-sources.pl:853
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -420,34 +493,40 @@ msgstr ""
 "Ziur zaude %s gakoa %s euskarritik kendu nahi duzula?\n"
 "(gakoaren izena: %s)"
 
-#: ../edit-urpm-sources.pl:871
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Gehitu gakoa..."
 
-#: ../edit-urpm-sources.pl:875
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Kendu giltza"
 
-#: ../edit-urpm-sources.pl:891
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Konfiguratu euskarria"
 
-#: ../edit-urpm-sources.pl:930
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Gaituta?"
 
-#: ../edit-urpm-sources.pl:931
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Eguneraketak?"
 
-#: ../edit-urpm-sources.pl:947
+#: ../edit-urpm-sources.pl:951
+#, c-format
 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:977
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -457,32 +536,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1011
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Erantsi pertsonalizatua..."
 
-#: ../edit-urpm-sources.pl:1015
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Eguneratu..."
 
-#: ../edit-urpm-sources.pl:1018
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Kudeatu gakoak..."
 
-#: ../edit-urpm-sources.pl:1020
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paraleloa..."
 
-#: ../edit-urpm-sources.pl:1021
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Aukera orokorrak.."
 
-#: ../edit-urpm-sources.pl:1031 ../rpmdrake:1428
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Laguntza"
 
-#: ../edit-urpm-sources.pl:1047 ../gurpmi.addmedia:98 ../rpmdrake:2144
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -492,7 +577,8 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../edit-urpm-sources.pl:1050
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -507,7 +593,8 @@ msgstr ""
 "berriaren paketea instalatzeko\n"
 "edo eguneratzeak egiteko."
 
-#: ../edit-urpm-sources.pl:1063
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -520,11 +607,12 @@ msgstr ""
 "instalatzen ari zara?)."
 
 #: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Ezin da euskarririk gehitu, argumentuak falta dira edo okerrekoak dira"
 
 #: ../gurpmi.addmedia:102
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -535,7 +623,7 @@ msgstr ""
 "horretatik gehitu ahal izango dituzula sisteman."
 
 #: ../gurpmi.addmedia:105
-#, perl-format
+#, c-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"
@@ -546,21 +634,22 @@ msgstr ""
 "horretatik gehitu ahal izango dituzula sisteman."
 
 #: ../gurpmi.addmedia:130
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "%s euskarria behar bezala gehitu da."
 
 #: ../gurpmi.addmedia:131
-#, perl-format
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "%s euskarria behar bezala gehitu da."
 
 #: ../rpmdrake:39
-#, perl-format
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Erabilera: %s [AUKERA]..."
 
 #: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -569,10 +658,12 @@ msgstr ""
 "baino lehenago deskribapen leihoan"
 
 #: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     mugatu emaniko euskarrira"
 
 #: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
@@ -580,12 +671,14 @@ msgstr ""
 "batzea proposatzen du"
 
 #: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            modua ezarri (instalatu (lehenetsia), ezabatu, "
 "eguneratu)"
 
 #: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
@@ -593,14 +686,17 @@ msgstr ""
 "moduan"
 
 #: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      ez eguneratu euskarria hasterakoan"
 
 #: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        ez egiaztatu paketeen sinadurak"
 
 #: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -609,26 +705,32 @@ msgstr ""
 "\" taldea, erabili \"ostalaria\" makina beharrezko menpekotasunak erakusteko"
 
 #: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    soilik pakete hauek erakutsi"
 
 #: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      aurre-aukeratu pakete hauek"
 
 #: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 behartu root gisa exekutatzea"
 
 #: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           \"pkg\"-ren bilaketa exekutatu"
 
 #: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Erabiltzaile-moduan ari da exekutatzen"
 
 #: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -639,70 +741,86 @@ msgstr ""
 "baina uneko datu-basea arakatu ahal izango duzu."
 
 #: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Erabilerraztasuna"
 
 #: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
 #: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Artxibatzen"
 
 #: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Babeskopia"
 
 #: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD grabaketa"
 
 #: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Konpresioa"
 
 #: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
 #: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
 #: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Bestelakoak"
 
 #: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
 #: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Liburuak"
 
 #: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Informatikako liburuak"
 
 #: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "FAQ-ak"
 
 #: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "\"Nola\""
 
 #: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Literatura"
 
 #: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Multzoa"
 
 #: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Mezu Pasea"
 
 #: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Ilara Zerbitzuak"
 
 #: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Komunikazioak"
 
 #: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Datu-baseak"
 
@@ -710,245 +828,302 @@ msgstr "Datu-baseak"
 #: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
 #: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Garapena"
 
 #: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
 #: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
 #: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME eta GTK+"
 
 #: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
 #: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE eta Qt"
 
 #: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Nukleoa"
 
 #: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
 #: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
 #: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
 #: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editoreak"
 
 #: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Heziketa"
 
 #: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulatzaileak"
 
 #: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Fitxategi-tresnak"
 
 #: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
 #: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
 #: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Jokoak"
 
 #: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Abentura"
 
 #: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Makina-jokoak"
 
 #: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Mahai-jokoak"
 
 #: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kartak"
 
 #: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Puzzleak"
 
 #: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Kirolak"
 
 #: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Estrategia"
 
 #: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
 #: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
 #: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Mahaigain grafikoa"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM oinarri du"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
 #: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Irudiak"
 
 #: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Kontrolatzen"
 
 #: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
 #: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Bideoa"
 
 #: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
 #: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
 #: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Sarea"
 
 #: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Berriketa"
 
 #: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Fitxategi-transferentzia"
 
 #: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
 #: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Berehalako mezularitza"
 
 #: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Posta"
 
 #: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Berriak"
 
 #: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Urruneko atzipena"
 
 #: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
 #: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Bulegoa"
 
 #: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Gako Publikoak"
 
 #: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Argitalpena"
 
 #: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
 #: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
 #: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Zientziak"
 
 #: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
 #: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologia"
 
 #: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Kimika"
 
 #: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Informatika"
 
 #: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Lurraren zientziak"
 
 #: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
 #: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fisika"
 
 #: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shell-ak"
 
 #: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Soinua"
 
@@ -958,326 +1133,392 @@ msgstr "Soinua"
 #: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
 #: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
 #: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistema"
 
 #: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Oinarria"
 
 #: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
 #: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
 #: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Abiarazi eta hasieratu"
 
 #: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Hardwarea"
 
 #: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Paketatzea"
 
 #: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Inprimatzen"
 
 #: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Hedaketa"
 
 #: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Hedaketa"
 
 #: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
 #: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
 #: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Kontsola"
 
 #: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
 #: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
 #: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bit-mapa"
 
 #: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Nazioartekotzea"
 
 #: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Nukleoa eta hardwarea"
 
 #: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Liburutegiak"
 
 #: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Zerbitzariak"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
 #: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminalak"
 
 #: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Testu-tresnak"
 
 #: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Jostagarriak"
 
-#. for Mandriva Choice:
 #: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
 #: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
 #: ../rpmdrake:345 ../rpmdrake:346
-#, fuzzy
+#, c-format
 msgid "Workstation"
-msgstr "Sare lokalaren konfigurazioa (LAN)"
+msgstr "Lanpostua"
 
 #: ../rpmdrake:339
-#, fuzzy
+#, c-format
 msgid "Console Tools"
-msgstr "Kontsola"
+msgstr "Kontsola-tresnak"
 
 #: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentazioa"
 
 #: ../rpmdrake:341
+#, c-format
 msgid "Game station"
-msgstr ""
+msgstr "Jokoak"
 
 #: ../rpmdrake:342
-#, fuzzy
+#, c-format
 msgid "Internet station"
-msgstr "Nazioartekotzea"
+msgstr "Internet"
 
 #: ../rpmdrake:343
-#, fuzzy
+#, c-format
 msgid "Multimedia station"
 msgstr "Multimedia"
 
 #: ../rpmdrake:344
-#, fuzzy
+#, c-format
 msgid "Network Computer (client)"
-msgstr "Informatika"
+msgstr "Sare-ordenagailua (bezeroa)"
 
 #: ../rpmdrake:345
+#, c-format
 msgid "Office Workstation"
-msgstr ""
+msgstr "Bulegoko lanpostua"
 
 #: ../rpmdrake:346
+#, c-format
 msgid "Scientific Workstation"
 msgstr ""
 
 #: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Graphical Environment"
-msgstr "Mahaigain grafikoa"
+msgstr "Ingurune grafikoa"
 
 #: ../rpmdrake:349
+#, c-format
 msgid "GNOME Workstation"
-msgstr ""
+msgstr "GNOME lanpostua"
 
 #: ../rpmdrake:350
+#, c-format
 msgid "IceWm Desktop"
-msgstr ""
+msgstr "IceWm Idaztegia"
 
 #: ../rpmdrake:351
+#, c-format
 msgid "KDE Workstation"
-msgstr ""
+msgstr "KDE lanpostua"
 
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Other Graphical Desktops"
-msgstr "Mahaigain grafikoa"
+msgstr "Beste mahaigain grafiko batzuk"
 
 #: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
 #: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
 msgid "Server"
 msgstr "Zerbitzaria"
 
 #: ../rpmdrake:357
+#, c-format
 msgid "DNS/NIS"
-msgstr ""
+msgstr "DNS/NIS"
 
 #: ../rpmdrake:358
-#, fuzzy
+#, c-format
 msgid "Database"
-msgstr "Datu-baseak"
+msgstr "Datu-basea"
 
 #: ../rpmdrake:359
+#, c-format
 msgid "Firewall/Router"
-msgstr ""
+msgstr "Suebakia/Bideratzailea"
 
 #: ../rpmdrake:361
+#, c-format
 msgid "Mail/Groupware/News"
 msgstr ""
 
 #: ../rpmdrake:362
-#, fuzzy
+#, c-format
 msgid "Network Computer server"
-msgstr "Informatika"
+msgstr "Sare-zerbitzaria"
 
 #: ../rpmdrake:363
+#, c-format
 msgid "Web/FTP"
-msgstr ""
+msgstr "Web/FTP"
 
-#. - to highlight information
-#: ../rpmdrake:502 ../rpmdrake:707 ../rpmdrake:712 ../rpmdrake:726
-#: ../rpmdrake:728
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Ez dago erabilgarri)"
 
-#: ../rpmdrake:534
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Bilaketaren emaitzak"
 
 #: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Bilaketaren emaitzak (bat ere ez)"
 
-#: ../rpmdrake:545 ../rpmdrake:2125
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Itxaron, bilatzen ari da..."
 
-#: ../rpmdrake:617 ../rpmdrake:921
-msgid "Addable"
-msgstr "Gehi daitekeena"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Software-euskarrien kudeatzailea"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Gelditu"
 
-#: ../rpmdrake:617 ../rpmdrake:921
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Berritu daitekeena"
 
-#: ../rpmdrake:619
-msgid "Not selected"
-msgstr "Ez dago hautatuta"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Gehi daitekeena"
 
 #: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Hautatuta"
 
-#. is it an update?
-#: ../rpmdrake:687 ../rpmdrake:744
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Ez dago hautatuta"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Garrantzia: "
 
-#: ../rpmdrake:688 ../rpmdrake:752
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Eguneratzeko arrazoia: "
 
-#: ../rpmdrake:692
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Segurtasunaren eguneratzeak"
 
-#: ../rpmdrake:700 ../rpmdrake:754
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Azalpenik ez"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Fitxategiak:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Changelog:"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Fitxategiak:\n"
 
-#: ../rpmdrake:728
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:733 ../rpmdrake.pm:807
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Euskarria: "
 
-#: ../rpmdrake:734
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Unean instalatutako bertsioa: "
 
-#: ../rpmdrake:738
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../rpmdrake:739
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Bertsioa: "
 
-#: ../rpmdrake:740
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Arkitektura: "
 
-#: ../rpmdrake:741
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:741
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Tamaina: "
 
-#. extra empty line
-#: ../rpmdrake:748
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Laburpena: "
 
-#: ../rpmdrake:754
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Azalpena: "
 
-#: ../rpmdrake:810 ../rpmdrake.pm:179
-#, fuzzy
-msgid "Software Management"
-msgstr "Software-euskarrien kudeatzailea"
-
-#: ../rpmdrake:827 ../rpmdrake:973 ../rpmdrake:975
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Paketeari buruzko informazio gehiago..."
 
-#: ../rpmdrake:829
-msgid "One of the following packages is needed:"
-msgstr "Ondoko paketeetako bat behar da:"
-
-#: ../rpmdrake:829
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Aukeratu"
 
-#: ../rpmdrake:870
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Ondoko paketeetako bat behar da:"
+msgstr[1] "Ondoko paketeetako bat behar da:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Itxaron, paketeen zerrenda egiten ari da..."
 
-#: ../rpmdrake:888
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Eguneratzerik ez"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1288,34 +1529,41 @@ msgstr ""
 "paketeetarako ez duzula eguneratzerik erabilgarri, \n"
 "edo lehendik guztiak instalatuta dituzula."
 
-#: ../rpmdrake:912 ../rpmdrake:1174
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Denak"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:960 ../rpmdrake:965
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Informazio gehiago"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Paketeei buruzko informazioa"
 
-#: ../rpmdrake:991
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Pakete osagarri batzuk ere kendu egin behar dira"
 
-#: ../rpmdrake:992
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Mendekotasunak direla eta, pakete hauek ere kendu egin behar dira:"
 
-#: ../rpmdrake:998 ../rpmdrake:1007
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Pakete batzuk ezin dira kendu"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1323,7 +1571,8 @@ msgstr ""
 "Pakete hauek kentzen badituzu, zure sistema hondatu egin liteke:\n"
 "\n"
 
-#: ../rpmdrake:1008 ../rpmdrake:1073
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1332,11 +1581,13 @@ msgstr ""
 "Mendekotasunak direla eta, pakete hauek ezin dira hautatu orain:\n"
 "\n"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Pakete osagarriak behar dira"
 
-#: ../rpmdrake:1038
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1346,137 +1597,164 @@ msgstr ""
 "egin behar dira:\n"
 "\n"
 
-#: ../rpmdrake:1053
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (alde batera utzitakoen zerrendari dagokio)"
 
-#: ../rpmdrake:1056
-msgid "Some packages can't be installed"
-msgstr "Pakete batzuk ezin dira instalatu"
-
-#: ../rpmdrake:1057
-#, perl-format
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Pakete batzuk ezin dira instalatu"
+msgstr[1] "Pakete batzuk ezin dira instalatu"
+
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Pakete hauek ezin dira hautatu:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Pakete hauek ezin dira hautatu:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:1072 ../rpmdrake:1896
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Pakete batzuk kendu egin behar dira"
 
-#: ../rpmdrake:1101
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Hautatuta: %s / Leku librea diskoan: %s"
 
-#: ../rpmdrake:1102
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Hautatutako tamaina: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:1107
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Deskribapena ez dago eskuragarri pakete honentzako\n"
 
-#: ../rpmdrake:1113 ../rpmdrake:1506
-#, perl-format
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Errore larria gertatu da: %s."
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Instalatu"
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Instalatu"
 
-#: ../rpmdrake:1175
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s aukera"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-en aukerak"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1177
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Pakete guztiak, alfabetikoki"
 
-#: ../rpmdrake:1178
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Pakete guztiak, eguneratzeen erabilgarritasunaren arabera"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Pakete guztiak, tamainaren arabera"
 
-#: ../rpmdrake:1180
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Pakete guztiak, hautapen-egoeraren arabera"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Hostoak bakarrik, instalatze-dataren arabera sailkatuta"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Pakete guztiak, taldearen arabera"
 
-#: ../rpmdrake:1184
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Eguneratze arruntak"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Segurtasunaren eguneratzeak"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Akats-konponketen eguneratzeak"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Eguneratze arruntak"
 
-#: ../rpmdrake:1184
-msgid "Security updates"
-msgstr "Segurtasunaren eguneratzeak"
-
-#: ../rpmdrake:1247
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "izenetan"
 
-#: ../rpmdrake:1249
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "azalpenetan"
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "fitxategi-izenetan"
 
-#: ../rpmdrake:1278
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Akatsa: %s irakurri-soilik muntatu dela dirudi."
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Lehenik pakete batzuk hautatu behar dituzu."
 
-#: ../rpmdrake:1287
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Pakete gehiegi hautatu dira"
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1285
+#, 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,142 +1770,171 @@ msgstr ""
 "\n"
 "Ziur zaude hautatutako pakete guztiak instalatu nahi dituzula?"
 
-#: ../rpmdrake:1320 ../rpmdrake:1323 ../rpmdrake:1334 ../rpmdrake:1347
-#: ../rpmdrake:1356
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Fitxategia"
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/Euskarria _Eguneratu"
 
-#: ../rpmdrake:1334
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/Aukeraketa _berrezarri"
 
-#: ../rpmdrake:1347
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Paketeen zerrenda birzamatu"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Irten"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>I"
 
-#: ../rpmdrake:1359 ../rpmdrake:1360 ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Aukerak"
 
-#: ../rpmdrake:1360
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Software-euskarrien kudeatzailea"
 
-#: ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Erakutsi automatikoki hautatutako paketeak"
 
-#: ../rpmdrake:1367 ../rpmdrake:1368 ../rpmdrake:1369 ../rpmdrake:1370
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Laguntza"
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Akatsen berri-ematea"
 
-#: ../rpmdrake:1370
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Honi buruz..."
 
-#. nicer formatting
-#: ../rpmdrake:1373
+#: ../rpmdrake:1370
+#, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:1375
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../rpmdrake:1377
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1379
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1384
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 
-#: ../rpmdrake:1408
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Bilatu:"
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Garbitu"
 
-#: ../rpmdrake:1433 ../rpmdrake.pm:758
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
 msgid "Select all"
 msgstr "Guztia hautatu"
 
-#: ../rpmdrake:1440
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Aplikatu"
 
-#: ../rpmdrake:1444
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Irten"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1461
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1462
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1463
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
 #: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Errore larria"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
-msgid "Initializing..."
-msgstr "Berrabiarazten..."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Itxaron"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
 msgid "Package installation..."
 msgstr "Paketearen instalazioa..."
 
-#: ../rpmdrake:1507 ../rpmdrake:1932 ../rpmdrake.pm:311
-msgid "Please wait"
-msgstr "Itxaron"
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Berrabiarazten..."
 
-#: ../rpmdrake:1530 ../rpmdrake:1918
-#, fuzzy
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Sare lokalaren konfigurazioa (LAN)"
 
-#: ../rpmdrake:1532
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1639,12 +1946,13 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../rpmdrake:1541
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Eguneratze-euskarria badago lehendik"
 
-#: ../rpmdrake:1542
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1660,12 +1968,13 @@ msgstr ""
 "\n"
 "Ondoren, %s berrabiarazi."
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Nola aukeratu ispilua eskuz"
 
-#: ../rpmdrake:1554
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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,67 +1988,73 @@ msgstr ""
 "\n"
 "Ondoren, %s berrabiarazi."
 
-#: ../rpmdrake:1567
-#, fuzzy
+#: ../rpmdrake:1570
+#, fuzzy, c-format
 msgid "Reading updates description"
 msgstr "azalpenetan"
 
-#: ../rpmdrake:1593 ../rpmdrake:1670
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Itxaron, pakete erabilgarriak bilatzen..."
 
-#: ../rpmdrake:1601
-#, fuzzy
+#: ../rpmdrake:1604
+#, fuzzy, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Itxaron, paketeen zerrenda egiten ari da..."
 
-#: ../rpmdrake:1637
-#, fuzzy
+#: ../rpmdrake:1640
+#, fuzzy, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Itxaron, pakete erabilgarriak bilatzen..."
 
-#: ../rpmdrake:1771
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "%s aztertzen"
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "aldaketak:"
 
-#: ../rpmdrake:1780
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Kendu .%s"
 
-#: ../rpmdrake:1784
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Erabili .%s fitxategi nagusi gisa"
 
-#: ../rpmdrake:1788
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Ez egin ezer"
 
-#: ../rpmdrake:1804
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Instalazioa amaitu da"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Aztertu..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1852 ../rpmdrake:2045
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Eskatutako pakete guztiak ondo instalatu dira."
 
-#: ../rpmdrake:1856 ../rpmdrake:2025
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Arazoa sortu da instalatzean"
 
-#: ../rpmdrake:1857 ../rpmdrake:2026 ../rpmdrake:2084
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1749,17 +2064,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1876
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Ezin dira iturburu-paketeak lortu."
 
-#: ../rpmdrake:1877
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ezin dira iturburu-paketeak lortu. %s"
 
-#: ../rpmdrake:1878 ../rpmdrake:1976
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1771,60 +2087,83 @@ msgstr ""
 "Erroreen berri eman da:\n"
 "%s"
 
-#: ../rpmdrake:1894
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Mendekotasunak asetzeko, ondoko %d paketeak instalatuko dira:\n"
+"%s\n"
+msgstr[1] ""
 "Mendekotasunak asetzeko, ondoko %d paketeak instalatuko dira:\n"
 "%s\n"
 
-#: ../rpmdrake:1898
-#, fuzzy, perl-format
-msgid "Remove %d packages?"
-msgstr "Kendu gako bat"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Kendu gako bat"
+msgstr[1] "Kendu gako bat"
 
-#: ../rpmdrake:1899
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Pakete hauek kendu egin behar dira beste batzuk berritu ahal izateko:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Jarraitu nahi duzu?"
+msgstr[1] ""
 "Pakete hauek kendu egin behar dira beste batzuk berritu ahal izateko:\n"
 "\n"
 "%s\n"
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../rpmdrake:1941
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Jarraitu nahi duzu?"
+
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Aldatu euskarria"
 
-#: ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sartu \"%s\" izena duen euskarria [%s] gailuan"
 
-#: ../rpmdrake:1927
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' paketea deskargatzen (%s/%s)..."
 
-#: ../rpmdrake:1947
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Paketeen sinadurak egiaztatzen..."
 
-#: ../rpmdrake:1960 ../rpmdrake.pm:737 ../rpmdrake.pm:846
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../rpmdrake:1961
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1838,12 +2177,13 @@ msgstr ""
 "\n"
 "Instalazioarekin aurrera jarraitu nahi duzu?"
 
-#: ../rpmdrake:1973 ../rpmdrake:2083
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
-#: ../rpmdrake:1974
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1854,25 +2194,28 @@ msgstr ""
 "%s\n"
 "Komeni da zure euskarrien datu-basea eguneratzea."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Paketeen instalazioa prestatzen..."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Prestatzen..."
 
-#: ../rpmdrake:1991
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketea instalatzen (%s/%s)..."
 
-#: ../rpmdrake:2006
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ezin da rpm fitxategira sarrera eduki [%s]"
 
-#: ../rpmdrake:2040
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1884,43 +2227,48 @@ msgstr ""
 "Konfigurazio fitxategi batzuk `.rpmnew' edo `.rpmsave' luzapenarekin \n"
 "sortu dira, batzuk azter ditzakezu ekintzak egiteko:"
 
-#: ../rpmdrake:2048
-#, fuzzy
+#: ../rpmdrake:2073
+#, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "Informazio normala"
 
-#: ../rpmdrake:2050
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Pakete hauek eguneraketa informazioa dakarte"
 
-#: ../rpmdrake:2058
-#, fuzzy
+#: ../rpmdrake:2083
+#, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "Paketeari buruzko informazio gehiago..."
 
-#: ../rpmdrake:2061
-#, fuzzy, perl-format
+#: ../rpmdrake:2086
+#, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "Paketearen gaineko informazio gehiago... [%s]"
 
-#: ../rpmdrake:2073 ../rpmdrake.pm:724 ../rpmdrake.pm:805 ../rpmdrake.pm:829
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Errorea"
 
-#: ../rpmdrake:2074
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Errore konponezina: ez da instalatzeko paketerik aurkitu."
 
-#: ../rpmdrake:2099
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Itxaron, paketeak kentzen..."
 
-#: ../rpmdrake:2110
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Arazoa sortu da kentzean"
 
-#: ../rpmdrake:2111
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1930,11 +2278,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2143
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Ongi etorri"
 
-#: ../rpmdrake:2148
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1946,8 +2296,8 @@ msgstr ""
 "Tresna hau lagungarria izango zaizu ordenagailutik zein software kendu\n"
 "nahi duzun aukeratzeko."
 
-#: ../rpmdrake:2153
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1959,11 +2309,13 @@ msgstr ""
 "Tresna honek zure konputagailuan instalatu nahi dituzun eguneraketak\n"
 "aukeratzen lagunduko dizu."
 
-#: ../rpmdrake:2158
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Ongi etorri software instalazio tresnara!"
 
-#: ../rpmdrake:2159
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1977,171 +2329,213 @@ msgstr ""
 "CDROM edo DVDan. Tresna hau lagungarria izango zaizu ordenagailuan\n"
 "instalatu nahi duzun softwarea aukeratzeko."
 
-#: ../rpmdrake.pm:103
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Software Eguneraketa"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Mesedez sartu proxy-ra sartzeko zure egiaztapen datuak\n"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Erabiltzaile izena:"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Software-paketeak kentzea"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Software Paketeen Eguneraketa"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Software-paketeen instalazioa"
 
-#: ../rpmdrake.pm:218
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Ez"
 
-#: ../rpmdrake.pm:222
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Bai"
 
-#: ../rpmdrake.pm:272
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Informazioa..."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgika"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Suitza"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Txekiar Errepublika"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Alemania"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake.pm:399 ../rpmdrake.pm:403
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grezia"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Espainia"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Frantzia"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Hungaria"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Herbehereak"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Errusia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Eslovakia"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Erresuma Batua"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Txina"
 
-#: ../rpmdrake.pm:420 ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Estatu Batuak"
 
-#: ../rpmdrake.pm:520
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2153,7 +2547,8 @@ msgstr ""
 "\n"
 "Jarraituko dut?"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2165,26 +2560,28 @@ msgstr ""
 "\n"
 "Jarraitu nahi duzu?"
 
-#: ../rpmdrake.pm:530 ../rpmdrake.pm:568
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s aukera"
 
-#: ../rpmdrake.pm:533
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Itxaron mesedez, ispiluen helbideak jaisten."
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Itxaron, ispiluen helbideak deskargatzen Mandriva-en web gunetik."
 
-#. - seems that value is bitten before being printed by next func..
-#: ../rpmdrake.pm:541
+#: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Errorea deskargatzean"
 
-#: ../rpmdrake.pm:543
-#, perl-format
+#: ../rpmdrake.pm:544
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2198,8 +2595,8 @@ msgstr ""
 "Baliteke sarea edo webgunea eskuragaitz egotea.\n"
 "Mesedez saiatu berriro beranduago."
 
-#: ../rpmdrake.pm:548
-#, perl-format
+#: ../rpmdrake.pm:549
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2213,15 +2610,18 @@ msgstr ""
 "Baliteke sarea edo Mandriva-en web gunea erabilgarri ez egotea.\n"
 "Saiatu berriro geroago."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Ez dago ispilurik"
 
-#: ../rpmdrake.pm:560
+#: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Ezin dut ispilu egokirik aurkitu."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2235,64 +2635,69 @@ msgstr ""
 "prozesadorearen arkitektura Mandriva Linux Eguneratze Ofizialak ez onartzea\n"
 "da."
 
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Aukeratu nahi duzun ispilua."
 
-#: ../rpmdrake.pm:633
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' euskarrirako fitxategia kopiatzen..."
 
-#: ../rpmdrake.pm:636
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' euskarriaren fitxategia aztertzen..."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' euskarriaren fitxategia aztertzen..."
 
-#: ../rpmdrake.pm:643
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " eginda."
 
-#: ../rpmdrake.pm:647
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " huts egin du!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:651
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s, %s euskarritik"
 
-#: ../rpmdrake.pm:655
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s'(r)en deskarga abiarazten..."
 
-#: ../rpmdrake.pm:659
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s'(r)en deskarga, falta den denbora:%s, abiadura:%s"
 
-#: ../rpmdrake.pm:662
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s'(r)en deskarga, abiadura:%s"
 
-#: ../rpmdrake.pm:673
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Itxaron, euskarria eguneratzen ari da..."
 
-#: ../rpmdrake.pm:700
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Akatsa paketeak eskuratzerakoan"
 
-#: ../rpmdrake.pm:701
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2307,27 +2712,31 @@ msgstr ""
 "ondoren berriro berkonfiguratzeko, edo une honetan ezin da atzeman\n"
 "eta beranduago saiatu behar zenuke berriro."
 
-#: ../rpmdrake.pm:732
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Eguneratu euskarriak"
 
-#: ../rpmdrake.pm:737
+#: ../rpmdrake.pm:739
+#, c-format
 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:744
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Hautatu eguneratu nahi duzun euskarria:"
 
-#: ../rpmdrake.pm:762
+#: ../rpmdrake.pm:764
+#, c-format
 msgid "Update"
 msgstr "Eguneratu"
 
-#: ../rpmdrake.pm:783
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2339,8 +2748,8 @@ msgstr ""
 "Erroreak:\n"
 "%s"
 
-#: ../rpmdrake.pm:806 ../rpmdrake.pm:817
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2350,16 +2759,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:829
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Ezin da euskarria sortu."
 
-#: ../rpmdrake.pm:834
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Ezin izan da euskarria gehitu"
 
-#: ../rpmdrake.pm:835
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2369,8 +2780,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:848
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2380,8 +2791,8 @@ msgstr ""
 "bertsioarekin (%s).\n"
 "Ezgaitu egingo da."
 
-#: ../rpmdrake.pm:851
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2391,11 +2802,13 @@ msgstr ""
 "Mandriva Linuxen bertsioarekin (%s).\n"
 "Ezgaitu egingo da."
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Laguntza atzeko planoan abiarazten da"
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2680,9 +3093,6 @@ msgstr "Software-euskarrien kudeatzailea"
 #~ msgid "No package found for installation."
 #~ msgstr "Ez da instalatzeko paketerik aurkitu."
 
-#~ msgid "Stop"
-#~ msgstr "Gelditu"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "Pakete guztiak, euskarri-biltegiaren arabera"
 
diff --git a/po/fa.po b/po/fa.po
index 94d6c6a6..2a425704 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2005-02-06 09:05-0500\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -16,12 +16,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "نوع رسانه را انتخاب کنید"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -43,16 +46,18 @@ msgstr ""
 " می‌آیند)، یا منابعی که بروزسازیهای رسمی توزیع شما عرضه میکنند.\n"
 "(شما میتوانید هر دو را اضافه کنید، ولی مجبورید آن را در دو گام انجام دهید.)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "منابع انتشار"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "بروزسازی‌های رسمی"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -68,86 +73,104 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "لطفا صبر کنید، در حال افزودن رسانه..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "افزودن یک رسانه"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "پرونده‌های محلی"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "مسیر:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "کارگزار FTP "
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "نشانی اینترنتی:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "کارگزار FTP "
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "کارگزار‌ HTTP"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "مسیر یا نقطه سوارسازی:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "دستگاه قابل انتقال"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "مسیر یا نقطه سوارسازی:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "مرور..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "ثبت‌ورود:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "مسیر نسبی به synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "اگر خالی گذاشته شود، synthesis/hdlist بطور خودکار شناسایی خواهد شد"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "نام:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "ایجاد کردن رسانه برای تمام توزیع"
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "انتخاب کردن رسانه‌ای که می‌خواهید بروزسازی کنید:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "شما باید حداقل دو ورودی اول را پر کنید."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -155,109 +178,132 @@ msgstr ""
 "یک رسانه با آن نام از قبل وجود دارد،\n"
 "آیا واقعاً می‌خواهید آن را جایگزین کنید؟"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "افزودن یک رسانه:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "نوع رسانه:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "تأیید"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "گزینه‌های جهانی برای نصب بسته..."
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "همیشه"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "هرگز"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "تصدیق RPMs برای نصب شدن"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "بارگیری برنامه برای استفاده:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "برداشتن متن کد"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "آیا مطمئن هستید که می‌خواهید متن کد \"%s\" را بردارید؟"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "لطفا صبر کنید، در حال برداشتن رسانه..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "ویرایش یک رسانه"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "ویرایش رسانه‌ی \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "ذخیره‌ی تغییرات"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "پراکسی..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "برای ادامه باید رسانه‌ای را به داخل دستگاه بگذارید"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "برای ذخیره‌ی تغییرات باید رسانه را درون دستگاه بگذارید."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "پیکربندی پراکسی‌ها"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "تنظیمات پراکسی برای رسانه‌ی \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "تنظیمات جهانی پراکسی"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -265,138 +311,172 @@ msgstr ""
 "اگر شما به یک پراکسی نیاز دارید، نام میزبان و یک درگاه دلخواه را وارد کنید "
 "(ترکیب: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "نام میزبان پراکسی:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "شما می‌توانید یک کاربر/گذرواژه را برای تأیید هویت پراکسی مشخص کنید:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "کاربر:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "افزودن یک گروه موازی"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "ویرایش یک گروه موازی"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "افزودن محدوده‌‌ی رسانه‌ای"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "رسانه‌ای ‌را برای افزودن در محدوده رسانه‌ها انتخاب کنید:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "افزودن یک میزبان"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "نام میزبان یا نشانی آی‌پی میزبان را برای افزودن تایپ کنید:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "ویرایش گروه موازی \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "نام گروه:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "پایان‌نامه:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "محدوده رسانه:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "افزودن"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "برداشتن"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "میزبان‌ها:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "پیکربندی urpmi موازی (اجرای توزیعی urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "گروه"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "محدوده رسانه"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "پایان‌نامه"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "محدوده رسانه"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "فرمان"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(هیچکدام)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "ویرایش"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "افزودن..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "اداره‌ی کلیدها برای امضاهای دیجیتالی بسته‌ها"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "رسانه"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "هیچ نامی یافت نشد، کلیدی در دسته کلید rpm وجود ندارد!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "افزودن یک کلید"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "انتخاب یک کلید برای اضافه کردن به رسانه‌ی %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "بستن"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "برداشتن یک کلید"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -404,33 +484,38 @@ msgstr ""
 "آیا مطمئن هستید که می‌خواهید کلید %s را از رسانه‌ی %s بردارید؟\n"
 "(نام کلید: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "افزودن یک کلید..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "برداشتن کلید"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "پیکربندی رسانه"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "به‌کارافتاده؟"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "بروزسازی"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -440,32 +525,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "افزودن سفارشی..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "بروزسازی..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "اداره‌ی کلیدها..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "موازی..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "گزینه‌های جهانی"
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "راهنما"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -475,7 +566,8 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -489,7 +581,8 @@ msgstr ""
 "استفاده کنید کمک خواهد کرد. آنها سپس برای نصب بسته‌ی جدید نرم‌افزار یا \n"
 "انجام بروزسازی در دسترس خواهند بود."
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -501,12 +594,13 @@ msgstr ""
 "رسانه‌ی دیگری بر رومیزی دیگری دارید، یا اکنون در حال\n"
 "نصب بسته‌هاید؟)"
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "ناتوان در افزودن رسانه، عدم وجود یا آرگومان‌های اشتباه"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -516,8 +610,8 @@ msgstr ""
 "این بدین معنی است که شما قادر خواهید بود بسته‌های نرم‌افزار\n"
 "جدیدی را به سیستم خود از آن رسانه‌ی جدید اضافه کنید."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -527,85 +621,96 @@ msgstr ""
 "این بدین معنی است که شما قادر خواهید بود بسته‌های نرم‌افزار\n"
 "جدیدی را به سیستم خود از آن رسانه‌ی جدید اضافه کنید."
 
-#: ../gurpmi.addmedia:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "رسانه‌ی '%s' با موفقیت اضافه شد."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "رسانه‌ی '%s' با موفقیت اضافه شد."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "طرز استفاده: %s [گزینه]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
-#, fuzzy
+#: ../rpmdrake:45
+#, fuzzy, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       -  فقط بروزسازی رسانه‌های بروزسازی.\n"
 
-#: ../rpmdrake:45
-#, fuzzy
+#: ../rpmdrake:46
+#, fuzzy, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
-#, fuzzy
+#: ../rpmdrake:50
+#, fuzzy, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 "\n"
 "                    گزارش شبح پشتیبان‌درایک\n"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "در حال اجرا در حالت کاربری"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -615,548 +720,784 @@ msgstr ""
 "شما قادر نخواهید بود تغییراتی را بر سیستم انجام دهید، ولی هنوز\n"
 "می‌توانید پایگاه داده‌ی موجود را مرور کنید."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "قابل دست‌یابی"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "بایگانی"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "ذخیره‌ی پشتیبان"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "نگارش سی‌دی"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "فشرده‌سازی"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "دیگری"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "کتاب‌ها"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "کتاب‌های رایانه"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "پرسش‌های مداوم"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "چگونگی‌ها"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "نوشتجات"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "رد و بدل پیغام"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "سرویس‌های صف"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "ارتباطات"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "پایگاه‌های داده"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "توسعه برنامه"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME و GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "جاوا"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE و Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "هسته"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "ویرایشگرها"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "آموزش"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "شبیه‌سازها"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "ابزار پرونده"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "بازی‌ها"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "ماجرا"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "آرکید"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "تخته‌ها"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "ورق‌ها"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "پازل‌ها"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "ورزش‌ها"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "تاکتیک"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "رومیزی گرافیکی"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "بر پایه‌ی FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "گنوم"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "اره‌ماهی"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "گرافیک‌ها"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "پایشگری"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "چندرسانه‌ای"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "ویدیو"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "شبکه‌کاری"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "گپ"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "انتقال‌ پرونده"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "پیغام‌رسانی آنی"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "پست"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "اخبار"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "دسترسی از دور دست"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "وب"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "دفتر"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "کلیدهای عمومی"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "منتشر کردن"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "دانش‌ها"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "نجوم"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "زیست‌شناسی"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "شیمی"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "دانش رایانه‌ای"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "دانش زمین‌شناسی"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "ریاضیات"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "فیزیک"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "پوسته‌ها"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "صوت"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "سیستم"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "پایه"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "پیکربندی"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "آغازگری و مقداردهی"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "سخت‌افزار"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "بسته‌بندی"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "چاپ"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "گسترش"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "گسترش"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "قلم‌ها"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "کنسول"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "نوع حقیقی"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "نوع۱"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "بین‌المللی کردن"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "هسته و سخت‌افزار"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "کتابخانه‌ها"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "کارگزارها"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "پایانه‌ها"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "ابزار متن"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "اسباب‌بازی‌ها"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "ایستگاه‌کار"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "ابزارهای کنسول"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "نوشتار"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "ایستگاه بازی"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "ایستگاه اینترنت"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "ایستگاه چندرسانه‌ای"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "رایانه‌ی شبکه (کارگیر)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "ایستگاه‌کار دفتری"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "محیط گرافیکی"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "ایستگاه‌کار گنوم"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "رومیزی Plucker"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "ایستگاه‌کار KDE "
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "دیگر رومیزی‌های گرافیکی"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "کارگزار"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "بانک ‌اطلاعات"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "دیوار‌آتش/مسیریاب"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "کارگزار شبکه‌ی رایانه"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(وجود ندارد)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "نتایج جستجو"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "نتایج جستجو (هیچ)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "لطفا صبر کنید، در حال جستجو..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "قابل افزودن"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "مدیر رسانه‌های نرم‌افزاری"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "توقف"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "قابل ارتقاء"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "انتخاب نشده"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "قابل افزودن"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "انتخاب شده"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "انتخاب نشده"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "اهمیت: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "دلیل برای بروزسازی:"
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "بروزسازی‌های امنیتی"
 
-#: ../rpmdrake:655 ../rpmdrake:708
-#, fuzzy
+#: ../rpmdrake:696 ../rpmdrake:750
+#, fuzzy, c-format
 msgid "No description"
 msgstr "در توضیحات"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "پرونده‌ها:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "ثبت‌تغییرات:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "پرونده‌ها:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "ثبت‌تغییرات:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "رسانه: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "نسخه‌ی نصب شده‌ی کنونی: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "نام: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "نسخه: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s کیلو‌بایت"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "اندازه: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s کیلو‌بایت"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "خلاصه: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "توصیف: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "مدیر رسانه‌های نرم‌افزاری"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "اطلاعات بیشتر درباره‌ی بسته..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "یکی از بسته‌های به دنبال آمده مورد نیاز است:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "لطفاً انتخاب کنید"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "یکی از بسته‌های به دنبال آمده مورد نیاز است:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "لطفا صبر کنید، در حال فهرست کردن بسته‌ها..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "بدون بروزسازی"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1166,34 +1507,41 @@ msgstr ""
 "به‌روزسازیی برای بسته‌ی نصب شده بر رایانه‌ی شما وجود ندارد یا شما\n"
 "قبلاً همه‌ی آنها را نصب کرده‌اید."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "همه"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "اطلاعات بیشتر"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "اطلاعات بسته‌ها"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "بعضی از بسته‌های اضافی لازم است برداشته شوند"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "بسته(های) بدنبال آمده نیز لازم است بخاطر وابستگی‌هایشان برداشته شوند:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "بعضی از بسته‌ها نمی‌توانند برداشته شوند"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1201,7 +1549,8 @@ msgstr ""
 "برداشتن این بسته‌ها سیستم شما را می‌شکند، متأسفم:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1210,11 +1559,13 @@ msgstr ""
 "بسته‌های بدنبال آمده بخاطر وابستگی‌های آنها اکنون نباید انتخاب شوند:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "بسته‌های بیشتری لازم است"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1224,132 +1575,159 @@ msgstr ""
 "نصب شود:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (به لیست نادیده گیری تعلق دارد)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "بعضی از بسته‌ها نمی‌توانند نصب شوند"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "بعضی از بسته‌ها نمی‌توانند نصب شوند"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "متأسفم، بسته(های) بدنبال آمده نمی‌تواند انتخاب شود:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "بعضی بسته‌ها لازم است برداشته شوند"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "انتخاب شده: %s / فضای دیسک آزاد: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "اندازه‌ی انتخاب شده: %d مگابایت"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "توضیحی برای این بسته در دسترس نیست\n"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "یک خطای مهلک رخ داد: %s."
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "نصب"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "نصب"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s انتخابها"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "انتخاب‌های ماندریبا"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "همه‌ی بسته‌ها، الفبایی"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "همه‌ی بسته‌ها، بوسیله در دسترسی بروزسازی آنها"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "همه‌ی بسته‌ها، بوسیله اندازه"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "تمام بسته‌ها، بوسیله‌ی وضعیت انتخاب"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "فقط مرتب شده با تاریخ نصب باقی بماند"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "همه‌ی بسته‌ها، بوسیله‌ی گروه"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "بروزسازی‌های عادی"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "بروزسازی‌های امنیتی"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "بروزسازی‌های اشکال‌زدایی‌"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "بروزسازی‌های عادی"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "بروزسازی‌های امنیتی"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "در نام‌ها"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "در توضیحات"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "در نام‌های پرونده‌"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "خطا: %s بنظر میرسد بطور فقط-خوانش سوار شده است."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "نخست باید بعضی از بسته‌ها را انتخاب کنید."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "بسته‌های بیش از اندازه انتخاب شده‌اند"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1364,133 +1742,171 @@ msgstr ""
 "\n"
 "آیا واقعاً می‌خواهید تمام بسته‌های انتخاب شده را نصب کنید؟"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_پرونده"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_رسانه‌ی بروزسازی"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_بازنشاندن انتخاب"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/بارگذاری مجدد لیست _بسته‌ها"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_ترک"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_گزینه‌ها"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "مدیر رسانه‌های نرم‌افزاری"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_نشان دادن خودکار بسته‌های انتخاب شده"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_راهنما"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_گزارش اشکال"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_درباره..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "ماندریبا بر اینترنت"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Abbas Izad <abbasizad@hotmail.com>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "یافتن:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "جستجو"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "پاک کردن"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "انتخاب همگی"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "اعمال"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "ترک"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "خطای مهلک"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "یک خطای مهلک رخ داد: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "لطفاً صبر کنید"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "نصب بسته..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "مقداردهی..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "پیکربندی LAN"
+msgstr "پیکربندی"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1502,12 +1918,13 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "رسانه‌ی از قبل موجود بروزسازی"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1523,12 +1940,13 @@ msgstr ""
 "\n"
 "پس از آن %s را دوباره شروع کنید."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "چگونگی انتخاب دستی آینه‌ی FTP خود"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1543,56 +1961,73 @@ msgstr ""
 "\n"
 "پس از آن %s را دوباره شروع کنید."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "در توضیحات"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "لطفا صبر کنید، در حال یافتن بسته‌های موجود..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "لطفا صبر کنید، در حال خواندن بانک اطلاعات بسته‌ها..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "لطفا صبر کنید، در حال فهرست کردن بسته‌ها..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "لطفا صبر کنید، در حال یافتن بسته‌های موجود..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "در حال بازرسی %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "تغییرات:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "برداشتن .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "استفاده از .%s مانند پرونده‌ی اصلی"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "هیچ کاری نکن"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "نصب پایان یافت"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "معاینه..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "تمام بسته‌های تقاضا شده با موفقیت نصب شده‌اند."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "اشکال هنگام نصب"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1602,17 +2037,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "نمی‌توان بسته‌های منبع را دریافت کرد."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "نمی‌توان بسته‌های منبع را دریافت کرد، متأسفم. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1624,67 +2060,73 @@ msgstr ""
 "خطا(های) گزارش شده:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "برای ارضای وابستگیها, %d بسته بدنبال آمده نصب خواهند شد:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "برداشتن یک کلید"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقاء یابند:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"آیا ادامه دهیم؟"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
 msgstr ""
-"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقاء یابند:\n"
-"\n"
 "%s\n"
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "مقداردهی..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "نصب بسته..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "لطفاً صبر کنید"
-
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "تعویض رسانه"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "لطفاً رسانه‌ی بنام \"%s\" را در دستگاه [%s] داخل کنید"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "بارگیری بسته‌ی `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "در حال تصدیق امضای بسته‌ها..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1698,12 +2140,13 @@ msgstr ""
 "\n"
 "آیا می‌خواهید نصب را ادامه دهید؟"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1715,26 +2158,28 @@ msgstr ""
 "\n"
 "شما ممکن است بخواهید بانک اطلاعات رسانه‌ها را بروزسازی کنید."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "در حال آماده کردن نصب بسته‌ها..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "در حال آماده کردن..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "در حال نصب بسته‌ی `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ناتوان در دستیابی به پرونده‌ی rpm [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1746,33 +2191,48 @@ msgstr ""
 "بعضی از پرونده‌های پیکربندی مانند `.rpmnew' یا `.rpmsave', ایجاد شده‌اند\n"
 "شما می‌توانید بعضی از آنها را برای اقدامات لازم معاینه کنید:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "اطلاعات عادی"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "این بسته‌ها با اطلاعات ارتقائی آمده‌اند"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "اطلاعات بیشتر درباره‌ی بسته..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "اطلاعات بیشتر درباره‌ی بسته... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "خطا"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "خطای غیر قابل تعمیر: هیچ بسته‌ای برای نصب پیدا نشد، متأسفم."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "لطفا صبر کنید، در حال برداشتن بسته‌ها..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "اشکال هنگام برداشتن"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1782,11 +2242,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "خوش آمدید"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1798,8 +2260,8 @@ msgstr ""
 "این ابزار در انتخاب نرم‌افزاری که می‌خواهید از این رایانه بردارید\n"
 "به شما کمک خواهد کرد."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1811,11 +2273,13 @@ msgstr ""
 "این ابزار به شما در انتخاب بروزسازی‌هایی که می‌خواهید بر رایانه خود نصب\n"
 "کنید کمک خواهد کرد."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "به ابزار نصب نرم‌افزار خوش آمدید!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1829,174 +2293,213 @@ msgstr ""
 "می‌شود. این ابزار به شما در انتخاب نرم‌افزاری که می‌خواهید بر رایانه‌ی خود نصب\n"
 "کنید کمک خواهد کرد."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "بروزسازی ماندریبا"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "بروزسازی نرم‌افزار"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "بروزسازی ماندریبا"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "لطفاً نشانی پست الکترونیکی خود را در زیر وارد کنید"
 
-#: ../rpmdrake.pm:130
-#, fuzzy
+#: ../rpmdrake.pm:132
+#, fuzzy, c-format
 msgid "User name:"
 msgstr "نام‌کاربر:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "برداشتن بسته‌های نرم‌افزار"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "بروزسازی بسته‌های نرم‌افزار"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "نصب بسته‌های نرم‌افزار"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "نه"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "بله"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "اطلاعات..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "اطریش"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "استرالیا"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "بلژیک"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "برزیل"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "کانادا"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "سوئیس"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "کوستا ریکا"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "جمهوری چک"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "آلمان"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "دانمارک"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "یونان"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "اسپانیا"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "فنلاند"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "فرانسه"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "مجارستان"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "اسرائیل"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "ایتالیا"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "ژاپن"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "کره"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "هلند"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "نروژ"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "لهستان"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "پرتغال"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "روسیه"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "سوئد"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "سنگاپور"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "اسلواکی"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "تایوان"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "بریتانیا"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "چین"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "ایالات متحده"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2008,7 +2511,8 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2020,26 +2524,28 @@ msgstr ""
 "\n"
 "آیا ادامه دهیم؟"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s انتخابها"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "لطفاً صبر کنید، در حال بارگیری نشانی‌های آینه‌ها."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "لطفاً صبر کنید، در حال بارگیری نشانی‌های آینه‌ها از وبگاه ماندریبا."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "خطا هنگام بارگیری"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2054,7 +2560,7 @@ msgstr ""
 "لطفاً بعداً دوباره امتحان کنید."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2069,14 +2575,17 @@ msgstr ""
 "لطفاً بعداً دوباره امتحان کنید."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "هیچ آینه‌ای"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "نمی‌توانم هیچ آینه مناسبی را پیدا کنم."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2091,63 +2600,68 @@ msgstr ""
 "لینوکس ماندریبا می‌باشد."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "لطفاً آینه‌ی مورد نظرتان را انتخاب کنید."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "کپی کردن پرونده برای رسانه `%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "آزمایش کردن پرونده‌ی رسانه‌ی `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "در حال آزمایش کردن پرونده‌ی دور دست رسانه‌ی `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " انجام شد."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " شکست خورد!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s از رسانه‌ی %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "در حال شروع بارگیری `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "بارگیری `%s'، زمان باقیمانده: %s، سرعت:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "بارگیری `%s'، سرعت:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "لطفا صبر کنید، در حال بروزسازی رسانه..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "خطا در دریافت بسته‌ها"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2163,29 +2677,29 @@ msgstr ""
 " کنید، یا آن اکنون در دسترس نیست و شما باید بعداً دوباره امتحان\n"
 " کنید. "
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "رسانه‌ی بروزسازی"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "انتخاب کردن رسانه‌ای که می‌خواهید بروزسازی کنید:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "انتخاب همگی"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "بروزسازی"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2197,8 +2711,8 @@ msgstr ""
 "خطاها:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2208,16 +2722,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "نمی‌توانم رسانه را ایجاد کنم."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "ناموفق بودن هنگام اضافه کردن رسانه"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2227,8 +2743,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2238,8 +2754,8 @@ msgstr ""
 "می‌کنید (%s) تطابق ندارد.\n"
 "آن از کار انداخته خواهد شد."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2249,11 +2765,13 @@ msgstr ""
 "که شما اجرا می‌کنید (%s) تطابق ندارد.\n"
 "آن از کار انداخته خواهد شد."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "راهنما در پس‌زمینه اجرا شد"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "پنجره‌ی راهنما شروع شده است، باید بزودی بر روی رومیزی شما ظاهر گردد."
@@ -2528,21 +3046,22 @@ msgstr "برداشتن نرم‌افزار"
 msgid "Software Media Manager"
 msgstr "مدیر رسانه‌های نرم‌افزاری"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "لطفا صبر کنید، در حال خواندن بانک اطلاعات بسته‌ها..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "هیچ بسته‌ای برای نصب یافت نشد."
 
-#~ msgid "Stop"
-#~ msgstr "توقف"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "همه‌ی بسته‌ها، بوسیله انبار رسانه"
 
-#~ msgid "Normal information"
-#~ msgstr "اطلاعات عادی"
-
 #~ msgid "Maximum information"
 #~ msgstr "حداکثر اطلاعات"
 
@@ -2564,8 +3083,5 @@ msgstr "مدیر رسانه‌های نرم‌افزاری"
 #~ msgid "Keys"
 #~ msgstr "کلیدها"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/_نما"
diff --git a/po/fi.po b/po/fi.po
index 3823cd41..7aee8f0c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fi - Mandriva 2007 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-09-18 19:44+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -22,12 +22,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Valitse median tyyppi"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -51,16 +54,18 @@ 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:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Jakelulähteet"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Viralliset päivitykset"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -78,84 +83,104 @@ msgstr ""
 "\n"
 "Sopiiko että jatketaan?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Odota, lisätään lähteet..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Lisää lähde"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Paikalliset tiedostot"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Polku:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP-palvelin"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC-palvelin"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP-palvelin"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Polku tai liitoskohta:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Siirrettävä laite"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Polku tai liitoskohta:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Selaa..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Käyttäjätunnus:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Suhteellinen polku tiedostoon synthesis tai hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Luo media kokonaiselle jakelulle"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Etsi päivityksiä tästä mediasta"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -163,109 +188,132 @@ msgstr ""
 "Tämän niminen lähde on jo olemassa,\n"
 "Oletko varma että haluat korvata sen?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Lisätään lähde:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Lähteen tyyppi:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Yleisasetukset ohjelmistopakettien asennusta varten"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "aina"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "ei koskaan"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Varmista asennettavia RPM paketteja: "
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Käytettävä latausohjelma:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Ohjelmistopakettien poisto"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Oletko varma että haluat poistaa lähteen \"%s\"?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Odota, poistetaan lähde..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Muokkaa lähdettä"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Muokataan lähdettä \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Tallenna muutokset"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Välityspalvelin..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Sinun pitää asettaa media jatkaaksesi"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Määritä välityspalvelin"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Välityspalvelinasetukset lähteelle \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Yleiset välityspalvelinasetukset"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -273,139 +321,173 @@ msgstr ""
 "Jos tarvitset välityspalvelinta, anna palvelimen nimi ja mahdollisesti "
 "portti (muodossa: <palvelinnimi[:portti]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Välityspalvelimen nimi:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Käyttäjä:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Lisää rinnakkaisryhmä"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Muokkaa rinnakkaisryhmää"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Lisää lähderajoitus"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Lisää kone"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Muokataan rinnakkaisryhmää \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Ryhmänimi:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Lähderajoitus:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Lisää"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Poista"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Koneet:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Aseta rinnakkais-urpmi (hajautettu urpmi:n suoritus)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Lähderajoitus"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Lähderajoitus"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Komento"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(tyhjä)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Muokkaa..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Lisää..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Pakettien digitaalisten allekirjoitusavaimien hallinta"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Lähde"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Avaimet"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Lisää avain"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Valitse lisättävä avain lähteelle %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Sulje"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Poista avain"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -413,32 +495,38 @@ msgstr ""
 "Oletko varma että haluat poistaa avaimen %s lähteeltä %s?\n"
 "(avaimen nimi: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Lisää avain..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Poista avain"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Määritä lähteet"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Käytössä?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Päivitykset?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Tämä lähde pitää päivittää jotta sitä voi käyttää. Päivitä nyt?"
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -448,32 +536,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Lisää mukautettu..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Päivitä..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Avaimien hallinta..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Rinnakkaistoiminnot..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Yleiset asetukset..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Ohje"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -483,7 +577,8 @@ msgstr ""
 "\n"
 "Sopiiko että jatketaan?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -497,7 +592,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -509,13 +605,14 @@ msgstr ""
 "lähteidenhallintaohjelma toisella työpöydällä tai oletko\n"
 "juuri asentamassa paketteja?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 "Lähteen lisääminen ei onnistunut, virheelliset tai puutteelliset argumentit"
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -525,8 +622,8 @@ msgstr ""
 "Tämä tarkoittaa että voit asentaa uusia ohjelmapaketteja\n"
 "järjestelmääsi uudesta ohjelmistolähteestä."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -536,22 +633,23 @@ msgstr ""
 "Tämä tarkoittaa että voit asentaa uusia ohjelmapaketteja\n"
 "järjestelmääsi uudesta ohjelmistolähteestä."
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Ohjelmistolähde `%s' lisättiin onnistuneesti."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Ohjelmistolähde `%s' lisättiin onnistuneesti."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Käyttö: %s [OPTIO]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -559,36 +657,43 @@ msgstr ""
 "  --changelog-first      näytä muutoslokia ennen tiedostolistausta "
 "kuvausikkunassa"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=media1,..      rajoita valittuun mediaan"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 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:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=MODE            aseta tila (install (oletus), remove, update)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      älä kysy ensimmäinen vahvistus päivitystilassa"
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      älä päivitä mediaa käynnistuksessä"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        älä tarkista pakettien allekirjoitukset"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -596,27 +701,33 @@ msgstr ""
 "  --parallel=alias,kone  aseta rinnakkaistila, käytä  \"alias\" ryhmä, käytä "
 "\"kone\" tietokone riippuvuuksien näyttämiseen"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    näytä ainoastaan näitä paketteja"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      valitse näitä paketteja etukäten"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 pakota suorittaminen root-tunnuksella"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           etsi paketti nimelä \"pkg\""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Suoritetaan käyttäjätilassa"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -626,545 +737,785 @@ msgstr ""
 "Et voi suorittaa muutoksia järjestelmään, mutta \n"
 "voit selata olemassa olevaa tietokantaa."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Käytettävyys"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arkistointi"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Varmistus"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD:n poltto"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Pakkaus"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Muu"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Kirjat"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Tietokonekirjat"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Faq"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howto"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Kirjallisuus"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Ryväs"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Viestinvälitys"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Jonotuspalvelut"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Viestintä"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Tietokannat"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Kehitys"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ja GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE ja Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Ydin"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editorit"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Opiskelu"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulaattorit"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Tiedostotyökalut"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Pelit"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Seikkailu"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Lautapelit"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kortti"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Ongelmanratkonta"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Urheilu"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategia"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Graafinen työpöytä"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM-pohjainen"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "IceWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafiikka"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Valvonta"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Verkko"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Tiedostonsiirto"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Pikaviestintä"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Uutiset"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Etäkäyttö"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Toimisto"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Julkiset avaimet"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Julkaisu"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Tiede"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Kemia"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Tietokoneet"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geotieteet"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematiikka"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fysiikka"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Komentotulkit"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Ääni"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Järjestelmä"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Perus"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Käynnistys ja alustus"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Laitteisto"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pakkaus"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Tulostus"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Sijoitus"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Sijoitus"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Kirjasimet"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Pääte"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bittikartta"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Kansainvälistäminen"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Ydin ja laitteisto"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Kirjastot"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Palvelimet"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Päätteet"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Tekstityökalut"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Lelut"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Työasema"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Komentorivityökalut"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentaatio"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Peliasema"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Internettyöasema"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimediatyöasema"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Verkkopääte (asiakas)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Toimistotyöasema"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Graafinen ympäristö"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME-työasema"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "IceWm Työpöytä"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE-työasema"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Muut graafiset käyttöympäristöt"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Palvelin"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Tietokanta"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Palomuuri / Reititin"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Verkkotietokone (palvelin)"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Ei käytettävissä)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Haun tulokset"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Haun tulokset (ei mitään)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Odota, etsitään..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Lisättävissä"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Ohjelmistohallinta"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Pysäytä"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Päivitettävissä"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Ei valittu"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Lisättävissä"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Valittu"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Ei valittu"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Tärkeys: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Syy päivitykseen: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Tietoturvaselitys"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Ei kuvausta"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Tiedostot:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Muutosloki:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Tiedostot:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Muutosloki:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Lähde: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Asennettu versio: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Nimi: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versio: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Arkitehtuuri: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s kt"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Koko: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s kt"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Yhteenveto: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Kuvaus: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Ohjelmistohallinta"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Lisätietoa paketista..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Yksi seuraavista paketeista tarvitaan:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Ole hyvä ja valitse"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Yksi seuraavista paketeista tarvitaan:"
+msgstr[1] "Yksi seuraavista paketeista tarvitaan:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Odota, listataan paketteja..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Ei päivityksiä"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1173,34 +1524,41 @@ msgstr ""
 "Päivityslista on tyhjä. Tämä tarkoittaa joko ettei\n"
 "päivityksiä löydy, tai olet jo asentanut kaikki."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Kaikki"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Lisätietoa"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Lisätietoa paketista"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Riippuvuuksien vuoksi myös seuraavat paketit joudutaan poistamaan:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Joitakin paketteja ei voida poistaa"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1208,7 +1566,8 @@ msgstr ""
 "Näiden pakettien poistaminen valitettavasti rikkoisi järjestelmäsi:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1218,11 +1577,13 @@ msgstr ""
 "nyt poistamaan valinnasta:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Lisäpaketteja vaaditaan"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1232,129 +1593,164 @@ msgstr ""
 "pitää asentaa:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (on ohitettavien listalla)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Joitakin paketteja ei voida asentaa"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Joitakin paketteja ei voida asentaa"
+msgstr[1] "Joitakin paketteja ei voida asentaa"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Valitettavasti seuraavia paketteja ei voida valita:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Valitettavasti seuraavia paketteja ei voida valita:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Joitakin paketteja pitää poistaa"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Valitut: %s / Vapaata levytilaa: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Valittujen koko: %d Mt"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Paketin kuvaus ei ole saatavilla\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Tapahtui ohittamaton virhe: %s."
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Asennettu"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Ei asennettu"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s valinnat"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux valinnat"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Kaikki paketit, aakkosjärjestyksessä"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Kaikki paketit, päivityksien saatavuuden mukaan"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Kaikki paketit, koon mukaan"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Kaikki paketit, valinnan mukaan"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Jäämistöt, eriteltynä asennuspäivämäärän mukaan"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Kaikki paketit, ryhmän mukaan"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Kaikki päivitykset"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Tietoturvapäivitykset"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Virhekorjaukset"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Tavalliset päivitykset"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Tietoturvapäivitykset"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "nimistä"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "kuvauksista"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "tiedostoista"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Virhe: %s näyttää olevean liitettynä ainoastan lukuoikeuksilla."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Sinun pitää valita joitakin paketteja ensin."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Liian paljon paketteja valittu"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1370,75 +1766,90 @@ msgstr ""
 "\n"
 "Oletko varma että haluat asentaa kaikki valitsemasi paketit?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Tiedosto"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/Päivitä lähteet"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/Palauta valinnat"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Lataa pakettilista uudelleen"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Lopeta"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>L"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Lähteiden Hallinta"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Näytä automaattisesti valitut paketit"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/O_hje"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Raportoi virheestä"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Tietoja..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
-msgstr "Tietoja Rpmdrake:sta"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake on Mandriva Linuxin pakettienhallintatyökalu."
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Thomas Backlund <tmb@mandriva.org>\n"
@@ -1448,60 +1859,87 @@ msgstr ""
 "Matias Griese <mahagr@utu.fi>\n"
 "Kim Enkovaara <kim.enkovaara@iki.fi>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Hae:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Etsi"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Valitse kaikki"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Poistu"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Pikaopas"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "Voit selata paketteja aiheluettelossa vasemmalla."
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Voit nähdä lisätietoja paketista valitsemalla sitä oikeassa listauksessa."
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "Asentaaksesi, päivittääksesi tai postaaksesi paketin, klikkaa \"valintaruutua"
 "\"."
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Ohittamaton virhe"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Tapahtui ohittamaton virhe: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Odota hetki"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Pakettien asennus..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Alustetaan..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Vahvistaminen"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1513,12 +1951,13 @@ msgstr ""
 "\n"
 "Sopiiko että jatkan?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Olemassa olevat päivityslähteet"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1534,12 +1973,13 @@ msgstr ""
 "\n"
 "Käynnistä tämän jälkeen %s uudelleen."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Miten manuaalisesti valitset peilipalvelimen"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1553,56 +1993,73 @@ msgstr ""
 "\n"
 "Käynnistä %s tämän jälkeen uudelleen."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "kuvauksista"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Odota, etsitään saatavilla olevia paketteja"
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Odota, pakettitietokantaa luetaan..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Odota, listataan paketteja..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Odota, etsitään saatavilla olevia paketteja"
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Tarkistetaan %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "muutokset:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Poista .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Käytä .%s päätiedostona"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Älä tee mitään"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Asennus on valmis"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Tarkista..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Kaikki haluamasi paketit asennettiin onnistuneesti."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Ongelma asennuksen aikana"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1612,17 +2069,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Lähdepakettien nouto epäonnistui."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Lähdepakettien nouto valitettavasti epäonnistui. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1634,67 +2092,83 @@ msgstr ""
 "Raportoidut virheet:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Riippuvuuksien täyttämiseksi seuraavat %d pakettia asennetaan :\n"
+"%s\n"
+msgstr[1] ""
 "Riippuvuuksien täyttämiseksi seuraavat %d pakettia asennetaan :\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Poista avain"
+msgstr[1] "Poista avain"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Seuraavat paketit pitää poistaa jotta muita voitaisiin päivittää:\n"
 "\n"
-"%s\n"
+"%s \n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Sopiiko että jatkan?"
+msgstr[1] ""
 "Seuraavat paketit pitää poistaa jotta muita voitaisiin päivittää:\n"
 "\n"
 "%s \n"
 "\n"
 "Sopiiko että jatkan?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Alustetaan..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Pakettien asennus..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Odota hetki"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Sopiiko että jatketaan?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Vaihda mediaa"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ole hyvä ja aseta media nimeltä \"%s\" laitteeseen [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Noudetaan pakettia `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Tarkistetaan pakettien allekirjoitukset..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1708,12 +2182,13 @@ msgstr ""
 "\n"
 "Haluatko jatkaa asennusta?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1725,25 +2200,28 @@ msgstr ""
 "\n"
 "Sinun kannattaisi päivittää lähdetietokantasi."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Valmistellaan ohjelmistopakettien asennusta..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Valmistellaan..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Asennetaan pakettia `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ei oikeuksia rpm-tiedostoon [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1755,34 +2233,49 @@ msgstr ""
 "Jotkut asetustiedostot tallennettiin päätteellä '.rpmnew' tai '.rpmsave',\n"
 "voit tarkistaa ne ja tehdä tarvittavat muutokset:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Tavallista tietoa"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Näissä paketeissa on päivitystiedot"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Lisätietoa paketista..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Lisätietoa paketista... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Virhe"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Ohittamaton virhe: yhtään pakettia ei valitettavasti löytynyt asennettavaksi."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Odota, paketteja poistetaan..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Ongelma poistamisen aikana"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1792,11 +2285,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Tervetuloa"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1808,8 +2303,8 @@ msgstr ""
 "Tämä ohjelma auttaa sinua valitsemaan ohjelmia joita haluat\n"
 "poistaa tietokoneestasi."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1821,11 +2316,13 @@ msgstr ""
 "Tämä ohjelma auttaa sinua valitsemaan päivityksiä joita haluat\n"
 "asentaa tietokoneeseesi."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Tervetuloa ohjelmien asennustyökaluun!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1839,172 +2336,213 @@ msgstr ""
 "CD- tai DVD-levy(i)llä. Tämä ohjelma auttaa sinua valitsemaan\n"
 "ohjelmia joita haluat asentaa tietokoneeseesi."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Ohjelmisto Päivitys"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Syötä tunnistetietojasi välityspalvelimen käyttämiseen\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Käyttäjänimi:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Ohjelmistopakettien poisto"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Ohjelmistopakettien päivitys"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Ohjelmistopakettien asennus"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Ei"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Kyllä"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Tietoja..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Itävalta"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasilia"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Sveitsi"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Tsekki"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Saksa"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Tanska"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Kreikka"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Espanja"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Suomi"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Ranska"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Unkari"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japani"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norja"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Puola"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugali"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Venäjä"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Kiina"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2016,7 +2554,8 @@ msgstr ""
 "\n"
 "Sopiiko että jatketaan?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2028,25 +2567,28 @@ msgstr ""
 "\n"
 "Sopiiko että jatketaan?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Peilipalvelimen valinta"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Odota, haetaan lista peilipalvelimista."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Odota, haetaan lista peilipalvelimista Mandrivain webbisivustosta."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Virhe latauksen aikana"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2061,7 +2603,7 @@ msgstr ""
 "Yritä myöhemmin uudelleen."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2076,14 +2618,17 @@ msgstr ""
 "Yritä myöhemmin uudelleen."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Ei peilipalvelinta"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "En löydä yhtään sopivaa peilipalvelinta."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2098,63 +2643,68 @@ msgstr ""
 "virallisissa Mandriva Linux päivityksissä."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopioidaan lähteen `%s' tiedostoa..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Tarkistetaan lähteen `%s' tiedostoa..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Tarkistetaan lähteen `%s' etätiedostoa..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " valmis."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " epäonnistui!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s lähteeltä %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Aloitetaan `%s' lataaminen..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Ladataan `%s', aikaa jäljellä:%s, nopeus:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Ladataan `%s', nopeus:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Odota, päivitetään lähteet..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Virhe noudettaessa paketteja"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2169,31 +2719,31 @@ msgstr ""
 "oikein asetettuna - tai se on tilapäisesti poistettu käytöstä\n"
 "jolloin voit yrittää myöhemmin uudelleen."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Päivitä lähteet"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Aktiivinen lähde ei löytynyt. sinun pitää aktivoida joitakin lähteitä "
 "voidaaksesi päivittää niitä."
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Valitse lähteet, jotka haluat päivittää:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Valitse kaikki"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2205,8 +2755,8 @@ msgstr ""
 "Virheet:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2216,16 +2766,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Lähteen luominen epäonnistui."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Virhe lisättäessä lähdettä"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2235,8 +2787,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2245,8 +2797,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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2256,11 +2808,13 @@ msgstr ""
 "versiota (%s).\n"
 "Lähde poistetaan käytöstä."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Ohje käynnistetty taustalla"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 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."
@@ -2535,21 +3089,21 @@ msgstr "Poista ohjelmia"
 msgid "Software Media Manager"
 msgstr "Ohjelmistolähteiden hallinta"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Odota, pakettitietokantaa luetaan..."
+
+#~ msgid "About Rpmdrake"
+#~ msgstr "Tietoja Rpmdrake:sta"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Yhtään pakettia ei löytynyt asennettavaksi."
 
-#~ 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"
 
@@ -2571,9 +3125,6 @@ msgstr "Ohjelmistolähteiden hallinta"
 #~ msgid "Keys"
 #~ msgstr "Avaimet"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/_Näytä"
 
diff --git a/po/he.po b/po/he.po
index cad72943..66ac9cf8 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-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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"
@@ -23,12 +23,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "בחירת סוג מקור"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -52,16 +55,18 @@ msgstr ""
 "יהיה עליך\n"
 "להוסיף כל מקור בפעולה נפרדת.)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "מקורות ההפצה"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "עדכונים רשמיים"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -79,85 +84,104 @@ msgstr ""
 "\n"
 "האם ניתן להמשיך?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "נא להמתין, מוסיף מקור..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "הוספת מקור"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "קבצים מקומיים"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "נתיב:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "שרת FTP"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "כתובת (URL):"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "שרת FTP"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "שרת HTTP"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "נתיב או נקודת עיגון (mount point):"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "התקן ניתן להסרה"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "נתיב או נקודת עיגון (mount point):"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "דפדוף..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "שם משתמש:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "הנתיב לקובץ synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "אם ריק, synthesis/hdlist ייבדק אוטומטית."
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "שם:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "יצירת מקור להפצה מלאה"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "חפש עדכונים במקור זה"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "עליך למלא לפחות את שתי הכניסות הראשונות."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -165,109 +189,132 @@ msgstr ""
 "כבר יש מקור חבילות בשם זה, האם ברצונך \n"
 "להחליף אותו ?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "הוספת מקור:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "סוג המקור:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "אישור"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "אפשרויות כלליות להתקנת חבילות"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "תמיד"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "אף פעם"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "בדיקת חבילות שיותקנו"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "הורדת תוכנה לשימוש"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "הסרת מקור"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "האם ברצונך להסיר את המקור \"%s\"?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "נא להמתין בעת הסרת המקור..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "עריכת מקור"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "עריכת מקור \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "שמירת שינויים"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "שרת מתווך...."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "עליך להכניס את המדיה בכדי להמשיך."
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "בכדי לשמור את השינויים, עליך להכניס את המדיה אל הכונן."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "הגדרת שרתים מתווכים"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "הגדרות שרת מתווך למקור \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "הגדרות כלליות לשרת מתווך"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -275,138 +322,172 @@ msgstr ""
 "אם נדרשת הגדרת שרת מתווך, יש להגדיר את שם המחשב המארח ויציאה (port) "
 "אופציונלית (תחביר:: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "שם המארח של השרת המתווך:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "באפשרותך לספק שם משתמש/סיסמה לצורך אימות בשרת המתווך:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "משתמש:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "הוסף קבוצה מקבילה"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "ערוך קבוצה מקבילה"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "הוספת הגבלת מקור"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "בחר מקור להוספה להגבלת המקורות:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "הוסף מארח"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "כתוב את שם המארח או כתובת IP להוספה:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "עריכת קבוצה מקבילית \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "שם קבוצה:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "פרוטוקול"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "הגבלת המקור:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "הוספה"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "הסרה"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "מארחים:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "הגדרת urpmi מקבילי (הרצה מבוזרת של urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "הגבלת מקור"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "הגבלת מקור"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "פקודה"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(כלום)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "עריכה"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "הוספה..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "נהל מפתחות עבור חתימות דיגיטאליות של חבילות"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "מקור"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "מפתחות אימות"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "שם לא נמצא, המפתח לא נמצא ברשת המפתחות של RPM!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "הוספת מפתח"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "נא לבחור מפתח להוספה למקור %s."
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "סגור"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "הסרת מפתח"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -414,32 +495,38 @@ msgstr ""
 "האם באמת למחוק את המפחת %s ממקור %s\n"
 "(שם המפתח %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "הוספה מפתח..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "הסרת מפתח"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "הגדרת מקורות"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "מופעל?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "עדכונים?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -449,32 +536,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "הוספת ידנית..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "עדכון..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "ניהול מפתחות..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "מקבילי....."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "הגדרות כלליות"
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "עזרה"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -484,7 +577,8 @@ msgstr ""
 "\n"
 "האם להמשיך ?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -498,7 +592,8 @@ msgstr ""
 "ברצונך להשתמשבמחשב זה. מקורות אלו ישמשו להתקנת חבילות\n"
 "תוכנה חדשות או  על-מנת לעדכן את המערכת."
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -510,12 +605,13 @@ msgstr ""
 "נוסף או שולחן עבודה אחר, שגם בו הנך מתקין חבילות\n"
 "כלשהן?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "אין אפשרות להוסיף מקור זה, בשל נתונים שגויים ו/או חסרים"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -524,8 +620,8 @@ msgstr ""
 "הוספת המקור '%s' תאפשר לך להתקין חבילות תוכנה\n"
 "חדשות למערכת שלך ממקור זה."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -534,56 +630,64 @@ msgstr ""
 "הוספת המקור '%s' תאפשר לך להתקין חבילות תוכנה\n"
 "חדשות למערכת שלך ממקור זה."
 
-#: ../gurpmi.addmedia:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "המקור '%s' נוסף בהצלחה."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "המקור '%s' נוסף בהצלחה."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "שימוש: %s [OPTION]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 "  --changelog-first      הצג את רשימת השינויים לפני רשימת הקבצים בחלון המידע"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     הגבל למקור הנתון"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     אחד את כל הקבצים שיימצאו מסוגl .rpmnew/.rpmsave"
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=MODE            set mode (install (default), remove, update)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      אל תשאל את שאלת האימות הראשונה בעת עדכון"
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      אל תעדכן את המקור בעת ההפעלה"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        אל תבדוק את חתימות החבילות"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -591,27 +695,33 @@ msgstr ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    הצג רק חבילות אלו"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      בחר מראש חבילות אלו"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 אלץ הפעלה כמנהל מערכת"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           חפש חבילה מסויימת"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "רץ במצב משתמש"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -621,547 +731,785 @@ msgstr ""
 "לא יתאפשר לך לבצע שינויים במערכת,\n"
 "אבל כן יתאפשר עיון במסד הנתונים הקיים."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "נגישות"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "כיווץ"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "גיבוי"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "צריבה"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "דחיסה"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "אחר"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "ספרים"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "ספרים על מחשוב"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "שאלות ותשובות"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "מדריכים"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "ספרות"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "אשכול"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "העברת הודעה"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "הכנסת שרותים לתור"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "תקשורת"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "בסיסי נתונים"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "פיתוח"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ו-GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE ו-QT"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "גרעין"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "עורכים"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "חינוך"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "אמולטורים"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "כלי ניהול קבצים"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "משחקים"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "הרפתקאות"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "משחקי Arcade"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "לוחות"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "קלפים"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "תצרף"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "ספורט"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "אסטרטגיה"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "שולחן עבודה גרפי"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "מבוסס FVWM "
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "גרפיקה"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "בקרה"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "מולטימדיה"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "וידאו"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "עבודה ברשת"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "צ'אט"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "העברת קבצים"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "מסרים מיידים"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "דוא\"ל"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "חדשות"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "גישה מרחוק"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "משרד"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "מפתחות ציבוריים"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "פרסום"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "מדעים"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "אסטרונומיה"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "ביולוגיה"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "כימיה"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "מדעי המחשב"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "מדעי כדוה\"א"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "מתמטיקה"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "פיזיקה"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "מסופים"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "שמע"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "מערכת"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "בסיס"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "הגדרות"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "אתחול"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "חומרה"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "אריזה"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "הדפסה"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "פריסה"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "פריסה"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "גופנים"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "מסוף"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "תמונת X11"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "בנאום"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "חומרה וגרעין"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "ספריות"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "שרתים"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "מסופים"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "כלי עיבוד טקסט"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "צעצועים"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "תחנת עבודה"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "כלי מסוף"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "מסמכים"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "תחנת עבודה למשחקים"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "תחנת עבודה לאינטרנט"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "תחנת עבודה למולטימדיה"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "מחשב רשת (לקוח)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "תחנת עבודה משרדית"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "סביבה גרפית"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "סביבת העבודה GNOME"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "שולחן עבודה IceWm"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "סביבת העבודה KDE"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "סביבות עבודה אחרות"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "שרת"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "מסדי נתונים"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "חומת אש/נתב"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "שרת מחשב רשת"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(לא-זמין)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "תוצאות חיפוש"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "תוצאות חיפוש (כלום)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "נא להמתין בעת החיפוש..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "ניתנות להוספה"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "מנהל מקורות תוכנה"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "עצור"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "ניתנות לשדרוג"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "לא מסומן"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "ניתנות להוספה"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "נבחרה"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "לא מסומן"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "חשיבות : "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "סיבת העדכון: "
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "עדכוני אבטחה"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "ללא תיאור"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "קבצים:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "רשימת שינויים:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "קבצים:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "רשימת שינויים:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "מקור: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "הגרסה המותקנת כרגע: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "שם: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "גרסה: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "ארכיטקטורה: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "גודל : "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "סיכום: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "תיאור: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "מנהל מקורות תוכנה"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "עוד מידע על החבילות..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "נדרשת אחת החבילות הבאות:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "עליך לבחור"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "נדרשת אחת החבילות הבאות:"
+msgstr[1] "נדרשת אחת החבילות הבאות:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "נא להמתין בעת הכנת רשימת חבילות..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "לא לעדכן"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1171,34 +1519,41 @@ msgstr ""
 "אין עדכונים זמינים עבור החבילות המותקנות במחשבך,\n"
 "או שכבר התקנת את כל העדכונים."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "הכל"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "עוד מידע"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "מידע על החבילות"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "יש צורך להסיר מספר חבילות נוספות"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "יש להסיר את החבילה/ות הבאה/ות בשל התלויות שלהן:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "כמה חבילות לא יכלו להיות מוסרות"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1206,7 +1561,8 @@ msgstr ""
 "הסרת החבילות הבאות, תהרוס לך את המערכת. מצטער: \n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1216,11 +1572,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "חבילות נוספות שנדרש להתקין"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1230,132 +1588,164 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (שייך לרשימת דילוג)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "מספר חבילות לא ניתנות להתקנה"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "מספר חבילות לא ניתנות להתקנה"
+msgstr[1] "מספר חבילות לא ניתנות להתקנה"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"מצטער, אין באפשרותך לבחור את החבילה או החבילות הבאות:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "מצטער, אין באפשרותך לבחור את החבילה או החבילות הבאות:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "יש להסיר מספר חבילות"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "גודל נבחר : %s /מקום פנוי : %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "גודל נבחר: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "אין תיאור זמין עבור חבילה זו\n"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "שגיאה חמורה אירעה : %s."
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "התקנה"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "התקנה"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s אפשרויות"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "חבילות מומלצות"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "כל החבילות, עפ\"י סדר האלף-בית"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "כל החבילות על פי זמינות עדכון"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "כל החבילות, לפי גודל"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "כל החבילות, לפי מחרוזת החיפוש"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "עלים בלבד, ממוין עפ\"י תאריך התקנה"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "כל החבילות, לפי נושא"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "עדכונים רגילים"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "עדכוני אבטחה"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "עדכוני באגים"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "עדכונים רגילים"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "עדכוני אבטחה"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "בשמות"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "בתיאורים"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "בשמות קבצים"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "שגיאה: נראה ו-%s עוגן לקריאה בלבד."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "יש לבחור חבילות קודם"
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "נבחרו יותר מדי חבילות"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1370,133 +1760,171 @@ msgstr ""
 "\n"
 "האם אכן ברצונך להתקין את כל החבילות שבחרת ?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_קובץ"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_עדכון מקורות"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_איפוס הבחירה"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/טעינה מחדש של _רשימת החבילות"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_יציאה"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/א_פשרויות"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "מנהל מקורות תוכנה"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/הראה חבילות שנבחרו באופן _אוטומטי"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_עזרה"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_דיווח באג"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_אודות..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "חנות מנדריבה"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "חיפוש:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "נקה"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "בחר הכל"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "החל"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "שגיאה חמורה"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "שגיאה חמורה אירעה : %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "נא להמתין"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "מתקין חבילות...."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "מאתחל..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "הגדרות רשת מקומית"
+msgstr "הגדרות"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1508,12 +1936,13 @@ msgstr ""
 "\n"
 "האם ברצונך להמשיך?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "כבר קיים מקור לעדכונים"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1528,12 +1957,13 @@ msgstr ""
 "\n"
 "לאחר מכן עליך לאתחל את %s מחדש."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "איך לבחור את אתר המראה באופן ידני"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1547,56 +1977,73 @@ msgstr ""
 "\n"
 "לאחר מכן, יעליך להפעיל מחדש את %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "בתיאורים"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "נא להמתין בעת הכנת רשימת חבילות..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
 msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "בוחן את %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "שינויים:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "הסרת .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "שימוש ב .%s כקובץ ראשי"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "לא לעשות כלום"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "ההתקנה הסתיימה"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "בחינה ...."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "כל החבילות המבוקשות הותקנו בהצלחה."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "התגלו בעיות תוך כדי ההתקנה "
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1606,17 +2053,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "לא יכול לקבל את חבילות המקור."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "לא יכול לקבל את חבילות המקור, מצטער. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1628,67 +2076,83 @@ msgstr ""
 "דו\"ח שגיאות:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"בכדי לספק את התלויות, %d החבילות הבאות יותקנו:\n"
+"%s\n"
+msgstr[1] ""
 "בכדי לספק את התלויות, %d החבילות הבאות יותקנו:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "הסרת מפתח"
+msgstr[1] "הסרת מפתח"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"החבילות הבאות יוסרו על מנת לאפשר שדרוג של חבילות אחרות:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"הודעה זו עלולה להתקבל באם מוגדר מקור לא מתאים למערכת שלך. האם להמשיך ?"
+msgstr[1] ""
 "החבילות הבאות יוסרו על מנת לאפשר שדרוג של חבילות אחרות:\n"
 "\n"
 "%s\n"
 "\n"
 "הודעה זו עלולה להתקבל באם מוגדר מקור לא מתאים למערכת שלך. האם להמשיך ?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "מאתחל..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "מתקין חבילות...."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "נא להמתין"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"האם להמשיך ?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "החלפת מדיה"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "עליך להכניס את המדיה בשם \"%s\" להתקן [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "מוריד את החבילה %s' (%s/%s)"
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "בודק את החתימות של החבילות..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1702,12 +2166,13 @@ msgstr ""
 "\n"
 "האם להמשיך את ההתקנה?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "התקנה נכשלה"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1719,26 +2184,28 @@ msgstr ""
 "\n"
 "יתכן שעליך לעדכן את בסיס הנתונים של מקורות התוכנה."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "מכין חבילות להתקנה..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "הכנה..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "מתקין את %s (חבילה %s מתוך %s)"
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "אין אפשרות גישה לחבילת התוכנה [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1750,33 +2217,48 @@ msgstr ""
 "נוצרו מספר קבצי הגדרות בשם, `.rpmnew' או `.rpmsave'\n"
 "יש באפשרותך לעיין בהם בכדי להשלים את עדכון המערכת שלך:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "מידע בסיסי"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "חבילות אלו מכילות מידע אודות שדרוג"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "עוד מידע על החבילות..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "עוד מידע על החבילה... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "שגיאה חמורה: לא נמצא חבילה להתקנה, מצטער."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "נא להמתין בעת הסרת החבילות..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "בעיה בזמן ההסרה"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1786,11 +2268,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "ברוך בואך"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1801,8 +2285,8 @@ msgstr ""
 "\n"
 "כלי זה יאפשר לך להסיר חבילות מהמחשב שלך."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1813,11 +2297,13 @@ msgstr ""
 "\n"
 "כלי זה יעזור לך לעדכן את המחשב שלך."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "ברוך בואך לכלי התקנות התוכנה!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1831,172 +2317,213 @@ msgstr ""
 "תוכנה בתקליטור(ים) או ברשת. כלי זה יעזור לך לבחור\n"
 "חבילות תוכנה להתקנה במחשב שלך."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "עדכון Mandriva Linux"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "עדכון חבילות תוכנה"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "עדכון Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "עליך להגדיר את פרטי ההתחברות לשרת המתווך\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "שם משתמש:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "הסרת חבילות תוכנה"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "עדכון חבילות תוכנה"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "התקנה של חבילות תוכנה."
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "לא"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "כן"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "מידע..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "אוסטריה"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "אוסטרליה"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "בלגיה"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "ברזיל"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "קנדה"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "שוייץ"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "קוסטה-ריקה"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "הרפובליקה הצ'כית"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "גרמניה"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "דנמרק"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "יוון"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "ספרד"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "פינלנד"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "צרפת"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "הונגריה"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "ישראל"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "איטליה"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "יפן"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "קוריאה"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "הולנד"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "נורווגיה"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "פולין"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "פורטוגל"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "רוסיה"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "שוודיה"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "סינגפור"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "סלובקיה"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "טיוואן"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "בריטניה"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "סין"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "ארה\"ב"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2008,7 +2535,8 @@ msgstr ""
 "\n"
 "האם ניתן להמשיך?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2020,26 +2548,28 @@ msgstr ""
 "\n"
 "האם ניתן להמשיך?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s אפשרויות"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr " נא להמתין, מוריד כתובות כתובות של אתרי מראה."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr " נא להמתין בעת הורדת כתובות אתרי מראה מאתר מנדריבה"
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "שגיאה בזמן הורדה"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2054,7 +2584,7 @@ msgstr ""
 "נא לנסות שוב מאוחר יותר."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2069,14 +2599,17 @@ msgstr ""
 "נא לנסות שוב מאוחר יותר."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "אין אתה מראה"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "לא נמצא אף אתר מראה מתאים."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2090,63 +2623,68 @@ msgstr ""
 "המעבד הראשי במחשב שלך לא נתמכת על-ידי העדכונים הרשמיים של Mandriva Linux."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "נא לבחור את אתר המראה אליו ברצונך להתחבר."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "העתקת קובץ עבור המקור `%s'.."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "בחינת קובץ ממקור `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "בחינת קובץ מרוחק במקור `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " סיום."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " נכשל!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s ממקור %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "מתחיל להוריד את %s..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "הורדה של `%s' במהירות: %s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "נא להמתין בעת עדכון המקור..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "חלה שגיאה בעת ייבוא החבילות"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2160,29 +2698,29 @@ msgstr ""
 "המקורות ולהוסיפו מחדש תוך הגדרתו כהלכה. ייתכן גם שמקור זה אינו\n"
 "זמין כרגע, ובמקרה זה עליך לנסות לעדכן את הרשימה מאוחר יותר."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "עדכון מקורות"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "נא לבחור את המקורות אותם ברצונך לעדכן:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "בחר הכל"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "עדכון"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2194,8 +2732,8 @@ msgstr ""
 "שגיאות:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2205,16 +2743,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "יצירת המקור נכשלה."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "חלה שגיאה בעת הוספת מקור"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2224,8 +2764,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2235,8 +2775,8 @@ msgstr ""
 "s).\n"
 "ולכן הוא ינוטרל."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2246,11 +2786,13 @@ msgstr ""
 "במערכת זו (%s).\n"
 "לכן הוא ינוטרל."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "חלון העזרה נפתח ברקע"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "חלון העזרה יפתח עוד מעט של שולחן העבודה שלך"
@@ -2525,21 +3067,22 @@ msgstr "הסרת תוכנה"
 msgid "Software Media Manager"
 msgstr "מנהל מקורות תוכנה"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "לא נמצאה חבילה להתקנה"
 
-#~ msgid "Stop"
-#~ msgstr "עצור"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "כל החבילות, לפי מקור תוכנה"
 
-#~ msgid "Normal information"
-#~ msgstr "מידע בסיסי"
-
 #~ msgid "Maximum information"
 #~ msgstr "מידע מפורט"
 
@@ -2560,6 +3103,3 @@ msgstr "מנהל מקורות תוכנה"
 
 #~ msgid "Keys"
 #~ msgstr "מפתחות"
-
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
diff --git a/po/hi.po b/po/hi.po
index 8de379ee..9da80f7b 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2005-08-21 15:37+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: Hindi, India\n"
@@ -15,12 +15,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "माध्यम के प्रकार को चुनें"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -42,16 +45,18 @@ msgstr ""
 "अधिकारिक अपडेटों को प्रदान करते है। (आप दोनों को भी जोड़ सकते है, परन्तु ऐसा करने के लिए\n"
 "आपको दो बार में इसे करना होगा ।)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "वितरण के स्रोत"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "अधिकारिक अपडेटस"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -69,85 +74,104 @@ msgstr ""
 "\n"
 "क्या अब जारी रख्ना ठीक है?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "कृपया प्रतीक्षा करें, माध्यम को जोड़ा जा रहा है..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "एक माध्यम को जोड़े"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "स्थानीय संचिकाऐं"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "पथ:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "एफ़०टी०पी० सर्वर"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "यू०आर०एल०:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "एफ़०टी०पी० सर्वर"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "एच०टी०टी०पी० सर्वर"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "पथ या आरोह बिन्दू:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "हटाने-योग्य साधन"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "पथ या आरोह बिन्दू:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "देखें..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "संत्र-आरम्भ:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "कूट-शब्द:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "कृत्रिमता/हार्ड-डिस्क सूची के लिए सापेक्ष पथ:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "यदि खाली छोड़ दिया जाए, तो कॄत्रिमता/हार्डडिस्क सूची स्वतः ही परिक्षित होगी"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "नाम:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "एक सम्पूर्ण वितरण के लिए माध्यम का चयन"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "अपडेटों के लिए इस माध्यम में खोजें"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "आपको कम-से-कम प्रथम और द्वितीय प्रवीष्ठयों को भरना चाहिए।"
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -155,109 +179,132 @@ msgstr ""
 "इस नाम का एक माध्यम पहले से विद्यमान है,\n"
 "क्या आप वास्तव में इसे बदलना चाहते है?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "एक माध्यम को जोड़े:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "माध्यम का प्रकार:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "निरस्त"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "ठीक"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "पैकेज संसाधन के लिए ग्लोबल विकल्प"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "सदैव"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "कभी नहीं"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "संसाधित किये जाने वाले आरपीएमो का सत्यापन:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "डॉउनलोड के लिए उपयोग किये जाने वाला प्रोग्राम:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "स्रोत को हटाना"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "क्या आप वास्तव में स्रोत \"%s\" को हटाना चाहते है?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "कॄपया प्रतिक्षा करें, माध्यम को हटाया जा रहा है..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "एक माध्यम को संपादित करें"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" माध्यम का संपादन किया जा रहा है:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "परिवर्तनों को सुरक्षित करें"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "प्रोक्सी..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "जारी रखने के लिए, आपको इस माध्यम को अन्दर डालना होगा"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "परिवर्तनों को सुरक्षित करने के लिए, आपको इस माध्यम को ड्राइव में डालना होगा।"
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "प्रोक्सियों की संरचना"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "\"%s\" माध्यम हेतु प्रोक्सी समायोजनायें"
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "सार्वभौम प्रोक्सी समायोजनायें"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -265,115 +312,141 @@ msgstr ""
 "यदि आपको एक प्रोक्सी की आवश्यकता है, तो एक होस्ट का नाम और एक ऐच्छिक पोर्ट "
 "बतायेंनिर्देश वाक्य रचना:<प्रोक्सी होस्ट[:पोर्ट]> (syntax:<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "प्रोक्सी होस्ट का नाम:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "आप को प्रोक्सी की प्रमाणिकता के लिए एक उपयोगकर्ता/कूट-शब्द को बताना होगा:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "उपयोगकर्ता:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "एक सामानान्तर समूह को जोड़े"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "एक समानान्तर समूह का संपादन करें"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "एक माध्यम की सीमा को जोड़े"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "मीडीया सीमा में जोड़ने के लिए, एक माध्यम का चयन करे:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "एक होस्ट को जोड़े"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "जोड़ने के लिए, होस्ट का नाम या आई०पी पता टाइप करें:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "\"%s\" सामान्तर समूह का संपादन किया जा रहा है:"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "समूह का नाम:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "प्रोटोकाल"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "माध्यम सीमा:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "जोड़े"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "हटायें"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "होस्ट्स:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 "समानान्तर यू०आर०पी०एम०आई० को संरचनित करें (यू०आर०पी०एम०आई० का अलग-अलग निष्पादन)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "समूह"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "मीडीया सीमा"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "प्रोटोकाल"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "मीडीया सीमा"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "निर्देश"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(कुछ नहीं)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "सपांदन"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "जोड़े..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "पैकेजों के अंकीय हस्ताक्षरों के लिए, कुँजीयों का प्रबंधन करें"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "माध्यम"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -381,25 +454,33 @@ msgstr ""
 "_:cryptographic keys\n"
 "कुँजीयां"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "कोई नाम नहीं मिला, कुँजी आर०पी०एम० की-रिंग में विद्यमान नहीं है!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "एक कुँजी जोड़े"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "%s माध्यम में जोड़ने के लिए, एक कुँजी का चयन करें"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "बन्द"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "एक कुँजी को हटायें"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -407,32 +488,38 @@ msgstr ""
 "क्या आप वास्तव में %s माध्यम से %s कुँजी को हटाना चाहते है?\n"
 "(कुँजी का नाम: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "एक कुँजी जोड़े..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "कुँजी को हटायें"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "माध्यम संरचना"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "सक्रिय?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "सभी अपडेट?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -442,32 +529,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "कस्टम जोड़े..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "अपडेट..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "कुँजीयों का प्रबंध करें..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "समानान्तर..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "ग्लोबल विकल्प..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "सहायता"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -477,7 +570,8 @@ msgstr ""
 "\n"
 "क्या जारी रखना ठीक है?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -491,7 +585,8 @@ msgstr ""
 "उपयोग करना चाहते है। यह सभी, तब नये सॉफ़्टवेयर पैकेजों को संसाधित करने में या अपडेट्स\n"
 "को करने के लिए उपलब्ध होगें।"
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -503,12 +598,13 @@ msgstr ""
 "दूसरे डेस्कटाप पर अन्य माध्यम प्रबंधक है, या आप वर्तमान में साथ-साथ\n"
 "पैकेजो को संसाधित कर रहे है?)"
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "माध्यम को जोड़ने में असमर्थ, गलत या विलुप्त आर्गूमेन्टस"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -517,8 +613,8 @@ msgstr ""
 "आप अब एक नये पैकेजों के माध्यम `%s' को जोड़ने जा रहे है ।\n"
 "इसका अर्थ है कि आप अपने तंत्र में नये सॉफ़्टवेयर पैकेजों को इस नये माध्यम से जोड़ने में समर्थ होगें ।"
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -527,58 +623,66 @@ msgstr ""
 "आप अब एक नये पैकेजों के माध्यम `%s' को जोड़ने जा रहे है ।\n"
 "इसका अर्थ है कि आप अपने तंत्र में नये सॉफ़्टवेयर पैकेजों को इस नये माध्यम से जोड़ने में समर्थ होगें ।"
 
-#: ../gurpmi.addmedia:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "`%s' माध्यम को सफ़लतापूर्वक जोड़ा गया ।"
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "`%s' माध्यम को सफ़लतापूर्वक जोड़ा गया ।"
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "उपयोगिता: %s [विकल्पों का नाम]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 "  --changelog-first      विवरण खिड़की में फ़ाइलसूची के पहिले  परिवर्तनलॉग दिखाना"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     दिये गये माध्यम के लिए सीमा"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     सभी पायी गयी .rpmnew/.rpmsave फ़ाइलों के विलय के लिए "
 "प्रस्ताव"
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            विधा को स्थापित करना (संसाधन (डिफ़ाल्ट), हटाना, अपडेट)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      अपडेट विधा में सबसे पहिले पुष्टि प्रश्न को ना पूछें"
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "   --no-media-update       - शुरुवात में माध्यम को अपडेट ना करें"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm       पैकेजों के हस्ताक्षरों को सत्यापित ना करें"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -586,27 +690,33 @@ msgstr ""
 "  --parallel=alias,host  सामान्तर विधा में रहना, \"alias\" समूह का उपयोग करना, "
 "\"host\" मशीन को आश्रित्ताओं को दिखाने के लिए उपयोग करना"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    सिर्फ़ इन पैकेजों को दिखाएँ"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      इन पैकेजों को पहिले से चयन करें"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 रूट जैसे चलाने के लिए बाध्य करना"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           \"pkg\" के लिए खोज़ चलाना"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "उपयोगकर्ता विधा में चलायमान"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -616,547 +726,785 @@ msgstr ""
 "आप इस प्रणाली पर परिवर्तनों को नहीं कर पायेगें,\n"
 "पर आप विद्यमान डाटाबेस को फ़िर भी देख सकते है।"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "प्रवेश-योग्यता"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "पुरालेखण"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "बैक-अप"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "सी०डी० लेखन"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "संकुचन"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "अन्य"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "पुस्तकें"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "कम्पूयटर पुस्तकें"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "बारम्बार पूछे जाने वाले प्रश्न"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "कैसे-करें"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "साहित्य"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "कलस्टर"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "संदेश आगे देना"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "कतार सेवायें"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "संचार"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "अनेक डाटाबेस"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "विकास"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "सी०"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "सी०++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "जीनोम और जी०टी०के०+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "जावा"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "के०डी०ई० और क्यू०टी०"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "कर्नल"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "पर्ल"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "पायथन"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "अनेक संपादक"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "शिक्षा"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "प्रतिस्पर्धक (एमयुलेटरस)"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "संचिका टूल्स"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "खेल"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "साहसिक कार्य"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "आरकेड"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "बोर्डस"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "कार्डस"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "पहेलियां"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "खेल-कूद"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "नीति"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "सचित्र डेस्कटाप"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "इनलाइटन-मेन्ट"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "एफ़०वी०डब्लू०एम० पर आधारित"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "गनोम"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "आईसीईडब्लूएम"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "के०डी०ई०"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "साफ़िस"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "विंडोमेकर"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "लेखा-चित्र (ग्राफ़िक्स)"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "निर्देशन"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "मल्टीमीडिया"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "वीडीओ"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "नेटवर्किंग"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "वार्तालाप"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "संचिका स्थानान्तरण"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "आई०आर०सी०"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "त्वरित संदेशवाहन"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "पत्र"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "समाचार"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "सुदूर पहुँच"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "डब्लू०डब्लू०डब्लू०"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "कार्यालय"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "सार्वजनिक कुँजियां"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "प्रकाशन"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "विज्ञान"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "खगोल विज्ञान"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "जीव विज्ञान"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "रसायन विज्ञान"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "कम्पूयटर विज्ञान"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "भू-विज्ञान"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "गणित"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "भौतिक-विज्ञान"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "प्रकोष्ठ (सेल)"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "ध्वनि"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "प्रणाली"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "आधार"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "संरचना"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "बूट और इन्टि"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "हार्डवेयर"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "पैकेजिंग"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "मुद्रण"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "डिप्लोईमेन्ट"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "डिप्लोईमेन्ट"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "फ़ोन्टस"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "कन्सोल"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "वास्तविक प्रकार (ट्रू टाइप)"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "प्रकार१"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 बिट मानचित्र"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "अंतर-राष्ट्रयीकरण "
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "कर्नल और हार्डवेयर"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "अनेक लेखागार"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "अनेक सर्वर"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "टर्मिनल्स"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "टेक्टस टूल्स"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "खिलौने"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "कार्यकेंद्र"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "कन्सोल के औज़ार"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "प्रलेखन"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "खेल स्टेशन"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "इन्टरनेट केन्द्र"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "मल्टीमीडीया केन्द्र"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "नेटवर्क कम्प्यूटर (ग्राहक)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "ऑफ़िस कार्यकेन्द्र"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "सचित्र वातावरण"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "गनोम कार्यकेन्द्र"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "डेस्कटाप"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "केडीई कार्यकेन्द्र"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "अन्य सचित्र डेस्कटाप"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "सर्वर"
+
+#: ../rpmdrake:357
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "डीएनएस"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "डाटाबेस"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "अग्नि-भीतिका/रूटर"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "नेटवर्क कम्प्यूटर सर्वर"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "वेब/एफ़०टी०पी०"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(उपलब्ध नहीं है)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "खोज के परिणाम"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "खोज के परिणाम (कुछ नहीं)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "कृपया प्रतीक्षा करें, खोज जारी है..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "जोड़ने-योग्य"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "सॉफ़्टवेयर मीडीया प्रबंधक"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "रूको"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "अपग्रेडेबल"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "चयन नहीं किया गया"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "जोड़ने-योग्य"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "चयन किया गया"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "चयन नहीं किया गया"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "महत्त्व: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "अपडेट करने का कारण: "
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "सुरक्षा अपडेटस"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "कोई वर्णन नहीं"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "सचिकाऐं:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "परिवर्तन रोजानामचा:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "सचिकाऐं:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "परिवर्तन रोजानामचा:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "माध्यम: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "वर्तमान संसाधित संस्मरण:  "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "नाम: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "संस्मरण: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "वास्तु:"
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s के०बी०"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "आकार: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s के०बी०"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "सारांश: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "विवरण: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "सॉफ़्टवेयर मीडीया प्रबंधक"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "पैकेज पर और ज्यादा सूचना..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "निम्नलिखित में से एक पैकेज की आवश्यकता है:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "कृपया चयन करें"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "निम्नलिखित में से एक पैकेज की आवश्यकता है:"
+msgstr[1] "निम्नलिखित में से एक पैकेज की आवश्यकता है:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "कृपया प्रतीक्षा करें, पैकेजों की सूची को दिखाया जा रहा है..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "कोई अपडेट नहीं"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1166,34 +1514,41 @@ msgstr ""
 "अपने कम्पूयटर पर संसाधित किया है, कोई अपडेट उपलब्ध नहीं है या आपने इन सभी\n"
 "को संसाधित कर लिया है।"
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "सभी"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "और सूचना"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "पैकेजों के बारे में सूचना"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "कुछ अतिरिक्त पैकेजों को भी हटाना होगा"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "अपनी अधिनताओं के कारण, निम्नलिखित पैकेज (पैकेजों) को भी  हटाना होगा:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "कुछ पैकेजों को हटाया नहीं जा सकता है"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1201,7 +1556,8 @@ msgstr ""
 "क्षमा करें, इन पैकेजों को हटाने से आपकी प्रणाली नष्ट हो जायेगी:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1211,11 +1567,13 @@ msgstr ""
 "अभी अचयनित किया जाना चाहिए:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "अतिरिक्त पैकेजों की आवश्यकता है"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1225,132 +1583,164 @@ msgstr ""
 "को भी संसाधित करना पड़ेगा:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (छोड़ी जाने वाली सूची में सम्मिलित है)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "कुछ पैकेजों को संसाधित नहीं किया जा सका"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "कुछ पैकेजों को संसाधित नहीं किया जा सका"
+msgstr[1] "कुछ पैकेजों को संसाधित नहीं किया जा सका"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"क्षमा करें, निम्नलिखित पैकेज (पैकेजों) का चयन नहीं किया जा सका:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "क्षमा करें, निम्नलिखित पैकेज (पैकेजों) का चयन नहीं किया जा सका:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "कुछ पैकेजों को हटाना चाहिए"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "चुना गया:  %s / मुक्त डिस्क स्थान: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "चुना हुआ आकार: %d एम०बी०"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "इस पैकेज हेतु विवरण उपलब्ध नहीं है\n"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "एक घातक त्रुटि घटित हुई है: %s "
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "संसाधन"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "संसाधन"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s पसन्दें"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "मैनड्रिव की पसन्द"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "सभी पैकेज, वर्णमाला के क्रम में"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "सभी पैकेज, अपडेट की उपलब्धता पर आधारित"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "सभी पैकेज, आकार के क्रम में"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "सभी पैकेज, चयन अवस्था के क्रम में "
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "सिर्फ़ लीवस, संसाधन तिथि के क्रम में "
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "सभी पैकेज, समूहों के क्रम में"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "सामान्य अपडेटस"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "सुरक्षा अपडेटस"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "दोष-निवारक अपडेटस"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "सामान्य अपडेटस"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "सुरक्षा अपडेटस"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "नामों में"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "विवरणों में"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "संचिका के नामों में"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "त्रुटि: सम्भवता %s को सिर्फ़-पढ़ने-के लिए माउन्ट किया गया लगता है ।"
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "आपको पहिले कुछ पैकेजों का चयन करना चाहिए।"
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "बहुत ज्यादा पैकेजों का चयन कर लिया गया है"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1366,133 +1756,171 @@ msgstr ""
 "\n"
 "क्या आप वास्तव में सभी चुनें हुए पैकेजों को संसाधित करना चाहते है?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/संचिका (_F)"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/माध्यम का अपडेट (_U)"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/चयन का रीसेट (_R)"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/पैकेजों की सूची का रीलोड (_p)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/निर्गम(_Q)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/विकल्प(_O)"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "सॉफ़्टवेयर मीडीया प्रबंधक"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/स्वतः चयनित पैकेजों को दिखायें (_S)"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/सहायता(_H)"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/दोष के बारे में बतायें (_R)"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/के बारे में (_A)..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "आरपीएमड्रैक"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "मैनड्रिव ऑनलाइन"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "प्राप्त:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "खोज"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "साफ़ करना "
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "सभी का चयन"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "प्रयोग करें"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "निकास"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "घातक त्रुटि"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "एक घातक त्रुटि घटित हुई है: %s "
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "कृपया प्रतीक्षा करें"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "पैकेज संसाधन..."
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "आरंभीकरण..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "स्थानीय क्षेत्र नेटवर्क संरचना"
+msgstr "संरचना"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1504,12 +1932,13 @@ msgstr ""
 "\n"
 "क्या जारी रखना ठीक है?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "अपडेट किया हुआ माध्यम पहले से विद्यमान है"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1525,12 +1954,13 @@ msgstr ""
 "\n"
 "इसके बाद, %s को पुनः आरम्भ करें।"
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "आपकी समरूप प्रणाली(mirror) को स्वंम कैसे चयन करें"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1544,56 +1974,73 @@ msgstr ""
 "\n"
 "इसके बाद, %s को पुनः आरम्भ करें।"
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "विवरणों में"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "कृपया प्रतीक्षा करें, उपलब्ध पैकेजों को पता लगाया जा रहा है..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "कृपया प्रतीक्षा करें, पैकेज डाटाबेस पढ़ा जा रहा है..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "कृपया प्रतीक्षा करें, पैकेजों की सूची को दिखाया जा रहा है..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "कृपया प्रतीक्षा करें, उपलब्ध पैकेजों को पता लगाया जा रहा है..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "%s की जाँच की जा रही है"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "परिवर्तन:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr ".%s को हटाये"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr ".%s को मुख्य संचिका की भांति उपयोग करें"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "कुछ नहीं करें"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "संसाधन समाप्त"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "जाँच की जा रही है..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "सभी निवेदित पैकेजों को सफ़लता-पूर्वक संसाधित किया गया।"
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "संसाधन के दौरान समस्या"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1603,17 +2050,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "स्रोत्र पैकेजों को प्राप्त करनें में असमर्थ"
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "स्रोत्र पैकेजों को प्राप्त करनें में असमर्थ, क्षमा करें। %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1625,67 +2073,83 @@ msgstr ""
 "त्रुटि(त्रुटियां) बतायी गई:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
+"%s\n"
+msgstr[1] ""
 "अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "एक कुँजी को हटायें"
+msgstr[1] "एक कुँजी को हटायें"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"अन्य पैकेजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"क्या जारी रखना ठीक है?"
+msgstr[1] ""
 "अन्य पैकेजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
 "\n"
 "%s\n"
 "\n"
 "क्या जारी रखना ठीक है?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "आरंभीकरण..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "पैकेज संसाधन..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "कृपया प्रतीक्षा करें"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"क्या जारी रखना ठीक है?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "माध्यम परिवर्तित करें"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन प्रणाली (डिवाइस) में डालें"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) पैकेज को डॉउनलोड किया जा रहा है..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "पैकेजों के हस्ताक्षर प्रमाणित किये जा रहे है..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1699,12 +2163,13 @@ msgstr ""
 "\n"
 "क्या आप संसाधन जारी रख्ना चाहते है?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "संसाधन असफ़ल"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1716,26 +2181,28 @@ msgstr ""
 "\n"
 "आपको आपने मीडीया डाटाबेस को अपडेट करना चाहिए।"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "पैकेजों के संसाधन की तैयारी की जा रही है..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "तैयारी की जा रही है..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "[%s] आरपीएम संचिका तक पहुँचने में असमर्थ"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1747,33 +2214,48 @@ msgstr ""
 "कुछ संरचना संचिकाओं का `.rpmnew' या `.rpmsave' की भांति निर्माण किया गया है,\n"
 "आप इनमें में कुछ का निरीक्षण, कार्यों को करने के लिए कर सकते है:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "सामान्य जानकारी"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "ये पैकेज अपग्रेड सूचना के सहित आते है"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "पैकेज पर और ज्यादा सूचना..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "पैकेज पर और अधिक सूचना... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "त्रुटि"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "असाध्य त्रुटि: संसाधन के लिए कोई पैकेज नहीं मिला, क्षमा करें।"
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "कृपया प्रतीक्षा करें, पैकेज हटाये जा रहे है..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "हटाने के दौरान समस्या"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1783,11 +2265,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "स्वागत"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1799,8 +2283,8 @@ msgstr ""
 "यह टूल, उन सॉफ़्टवेयरों को चयन करने में आपकी मदद करेगा, \n"
 "जिन्हें आप अपने कम्पूयटर से हटाना चाहते है।"
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1812,11 +2296,13 @@ msgstr ""
 "यह टूल, उन अपडेटस को चयन करने में आपकी मदद करेगा, \n"
 "जिन्हें आप अपने कम्पूयटर पर संसाधित करना चाहते है।"
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "सॉफ़्टवेयर संसाधन टूल में आपका स्वागत !"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1831,172 +2317,213 @@ msgstr ""
 "यह टूल, उन सॉफ़्टवेयरों को चयन करने में आपकी मदद करेगा, \n"
 "जिन्हें आप अपने कम्पूयटर पर संसाधित करना चाहते है।"
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "मैनड्रिव लिनक्स अपडेट"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "सॉफ़्टवेयर अपडेट"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "मैनड्रिव लिनक्स अपडेट"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "कृपया प्रोक्सी पर पहुँच पाने के लिए अपने अधिकार-पत्र बताएँ\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "उपयोगकर्ता नाम:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "सॉफ़्तवेयर पैकजों का निरस्तीकरण"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "सॉफ़्टवेयर पैकजों का अपडेट"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "सॉफ़्टवेयर पैकेजों का संसाधन"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "नहीं"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "हाँ"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "सूचना..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "आस्ट्रिया"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "आस्ट्रेलिया"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "बेल्जियम"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "ब्राज़ील"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "कनाडा"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "कोस्टारिका"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "ज़ेक रिपब्लिक"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "जर्मनी"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "डेनमार्क"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "ग्रीस"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "स्पेन"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "फ़िनलैण्ड"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "फ़्रांस"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "हंगरी"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "इजरायल"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "इटली"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "जापान"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "कोरिया"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "नीदरलैण्ड"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "नार्वे"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "पोलैण्ड"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "पुर्तगाल"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "सोवियत रूस"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "स्वीडन"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "ताईवान"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "ब्रिटेन"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "चीन"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "अमेरिका"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2008,7 +2535,8 @@ msgstr ""
 "\n"
 "क्या अब जारी रख्ना ठीक है?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2020,28 +2548,30 @@ msgstr ""
 "\n"
 "क्या अब जारी रख्ना ठीक है?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s पसन्दें"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "कृपया प्रतीक्षा करें, मिरर पतों को डॉउनलोड किये जा रहे है। "
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "कृपया प्रतीक्षा करें, मैनड्रिव सॉफ़्ट वेब स्थल से समरूप प्रणालियों के पते डॉउनलोड किये जा रहे "
 "है। "
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "डॉउनलोड के दौरान त्रूटि"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2056,7 +2586,7 @@ msgstr ""
 "कृपया कुछ समय उपरान्त पुनः प्रयास करें।"
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2071,14 +2601,17 @@ msgstr ""
 "कृपया कुछ समय उपरान्त पुनः प्रयास करें।"
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "कोई समरूप प्रणाली उपलब्ध नहीं"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "मै किसी अनुरूप मिरर को नहीं खोज सका ।"
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2093,63 +2626,68 @@ msgstr ""
 "समर्थित नहीं करते हो।"
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "कृपया इच्छित समरूप प्रणाली का चयन करें।"
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s' माध्यम के लिए संचिका की प्रतिलिपि बनाई जा रही है..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s' माध्यम की संचिका का निरीक्षण हो रहा है..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s' माध्यम की सूदूर संचिका का निरीक्षण किया जा रहा है..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr "किया गया।"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr "असफ़ल!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s माध्यम से %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' का डॉउनलोड आरम्भ हो रहा है..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' का डॉउनलोड, समय अनुमान:%s, गति:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' का डॉउनलोड, गति:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "कृपया प्रतीक्षा करें, माध्यम अपडेट किया जा रहा है..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "पैकेजों को पुनःप्राप्त करने में त्रुटि"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2165,29 +2703,29 @@ msgstr ""
 "या फ़िर वर्तमान में पहुँच से बाहर है और आपको कुछ समय पश्चात \n"
 "पुनः प्रयास करना चाहिए।"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "माध्यम को अपडेट करें"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "उस माध्यम का चयन करें जिसे आप अपडेट करना चाहते है:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "सभी का चयन"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "अपडेट"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2199,8 +2737,8 @@ msgstr ""
 "त्रुटियां:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2210,16 +2748,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "माध्यम का निर्माण करने में असमर्थ।"
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "असफ़लता जब माध्यम को जोड़ा जा रहा था..."
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2229,8 +2769,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2240,8 +2780,8 @@ msgstr ""
 "नहीं खाता है,  आप (%s) चला रहे है ।\n"
 "इसे निष्क्रिय कर दिया जायेगा ।"
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2251,11 +2791,13 @@ msgstr ""
 "संस्मरण, जिसे आप चला रहे है (%s), के साथ मेल नहीं खा रहा है। \n"
 "इसे निष्क्रिय कर दिया जायेगा ।"
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "सहायता पृष्टभूमि में आरम्भ है"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "सहायता विंडो शुरू हो चुकी है, थोड़ी देर में यह आपकी डेस्कटाप पर दिखाई देगी।"
@@ -2530,21 +3072,18 @@ msgstr "सॉफ़्टवेयर निरस्तीकरण"
 msgid "Software Media Manager"
 msgstr "सॉफ़्टवेयर मीडीया प्रबंधक"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "कृपया प्रतीक्षा करें, पैकेज डाटाबेस पढ़ा जा रहा है..."
+
 #~ msgid "XFree86"
 #~ msgstr "एक्सफ़्री-८६"
 
 #~ msgid "No package found for installation."
 #~ msgstr "संसाधन के लिए कोई पैकेज नहीं मिला"
 
-#~ msgid "Stop"
-#~ msgstr "रूको"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "सभी पैकेज, माध्यम भन्डार के क्रम में"
 
-#~ msgid "Normal information"
-#~ msgstr "सामान्य जानकारी"
-
 #~ msgid "Maximum information"
 #~ msgstr "सबसे ज्यादा जानकारी"
 
diff --git a/po/hy.po b/po/hy.po
index c1624238..4cdfe2c8 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -5,19 +5,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bootsplash VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -31,16 +34,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -51,399 +56,489 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Ուղի`"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:140
-msgid "Removable device"
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Մուտք`"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Գաղտնաբառը`"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Հրաժարվել"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Լավ"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Ավելացնել"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Հեռացնել"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Խումբ"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Protocol"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
-msgid "Protocol"
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Հրաման"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Խմբագրել"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, fuzzy, c-format
+msgid "Close"
+msgstr "Մաքրել"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-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:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Օգնություն"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -452,7 +547,8 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -460,823 +556,1119 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr ""
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Մատչելիություն"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Արխիվացում"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Պահեստավորում"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD Այրում"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Սեղմում"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Այլ"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr ""
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Կապեր"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Տվյալների բազաներ"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Ծրագրավորում"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr ""
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr ""
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr ""
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr ""
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Խմբագրիչներ"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Ուսուցում"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Էմուլատորներ"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Ֆայլերի գործիքներ"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Խաղեր"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Արկածային"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Արկադ"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Սեղանի Խաղեր"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Թղթախաղեր"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Գլուխկոտրուկներ"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Սպորտ"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Ստրատեգիա"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr ""
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Գրաֆիկա"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Մոնիթորինգ"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Բազմասփյուռ"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Վիդեո"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Հաղորդակցություն"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Զրուցարան"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Ֆայլերի փոխադրում"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Վայրկենական հաղորդագրություն"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Փոստ"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Նորություններ"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Հեռակա մուտք"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Գրասենյակ"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Հրատարակում"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Գիտություններ"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Աստղագիտություն"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Կենսաբանություն"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Քիմիա"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Համակարգչային գիտություն"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Երկրաբանություն"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Մաթեմատիկա"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Ֆիզիկա"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Միջավայրեր"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Ձայն"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Համակարգ"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Կոնֆիգուրացիա"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Բեռնում և Նախակարգում"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Սարքավորումներ"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Փաթեթներ"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Տպում"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr ""
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr ""
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr ""
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr ""
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Տերմինալ"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Տեքստի Գործիքներ"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Խաղալիքներ"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, fuzzy, c-format
+msgid "Workstation"
+msgstr "Կոնֆիգուրացիա"
+
+#: ../rpmdrake:339
+#, fuzzy, c-format
+msgid "Console Tools"
+msgstr "Ֆայլերի գործիքներ"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr ""
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr ""
+
+#: ../rpmdrake:342
+#, fuzzy, c-format
+msgid "Internet station"
+msgstr "Վայրկենական հաղորդագրություն"
+
+#: ../rpmdrake:343
+#, fuzzy, c-format
+msgid "Multimedia station"
+msgstr "Բազմասփյուռ"
+
+#: ../rpmdrake:344
+#, fuzzy, c-format
+msgid "Network Computer (client)"
+msgstr "Համակարգչային գիտություն"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr ""
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr ""
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr ""
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr ""
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr ""
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr ""
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr ""
+
+#: ../rpmdrake:358
+#, fuzzy, c-format
+msgid "Database"
+msgstr "Տվյալների բազաներ"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr ""
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "Համակարգչային գիտություն"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr ""
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr ""
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr ""
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr ""
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
 msgstr ""
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:560
-msgid "Not selected"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr ""
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr ""
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr ""
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr ""
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr ""
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr ""
 
-#: ../rpmdrake:630
-#, fuzzy
+#: ../rpmdrake:719
+#, fuzzy, c-format
 msgid "Files:\n"
 msgstr "/_Ֆայլ"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr ""
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr ""
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
+#: ../rpmdrake:737
+#, c-format
+msgid "Size: "
 msgstr ""
 
-#: ../rpmdrake:648
-msgid "Size: "
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
 msgstr ""
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr ""
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr ""
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr ""
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr ""
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr ""
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr ""
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr ""
+#: ../rpmdrake:1053
+#, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr ""
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr ""
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr ""
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr ""
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr ""
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr ""
 
-#: ../rpmdrake:1067
-msgid "Bugfixes updates"
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake:1067
-msgid "Normal updates"
+#: ../rpmdrake:1181
+#, c-format
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1067
-msgid "Security updates"
+#: ../rpmdrake:1181
+#, c-format
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr ""
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr ""
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1286,130 +1678,171 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Ֆայլ"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr ""
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr ""
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Անջատել"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Օպցիաներ"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr ""
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Օգնություն"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Սխալի զեկուցում"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Ընդհանուր..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, c-format
+msgid "Rpmdrake"
 msgstr ""
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr ""
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr ""
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Մաքրել"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr ""
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Կիրառել"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Ելք"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr ""
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr ""
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
 msgstr ""
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
 msgstr "Կոնֆիգուրացիա"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1417,12 +1850,13 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr ""
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1432,12 +1866,13 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1446,73 +1881,91 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, c-format
+msgid "Reading updates description"
+msgstr ""
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake:1604
+#, c-format
+msgid "Please wait, listing base packages..."
+msgstr ""
+
+#: ../rpmdrake:1640
+#, c-format
+msgid "Please wait, finding installed packages..."
 msgstr ""
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr ""
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr ""
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr ""
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr ""
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1520,61 +1973,66 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
-
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr ""
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Հեռակա մուտք"
+msgstr[1] "Հեռակա մուտք"
 
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr ""
+#: ../rpmdrake:1927
+#, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
+#: ../rpmdrake:1927
+#, c-format
+msgid "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
-#, fuzzy
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, fuzzy, c-format
 msgid "Warning"
 msgstr "Տպում"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1583,12 +2041,13 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr ""
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1596,25 +2055,28 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr ""
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1622,44 +2084,61 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, c-format
+msgid "Upgrade information about this package"
+msgstr ""
+
+#: ../rpmdrake:2086
+#, c-format
+msgid "Upgrade information about package %s"
 msgstr ""
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Սխալ"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr ""
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Ողջույն"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1667,8 +2146,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1676,11 +2155,13 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1689,173 +2170,213 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Software Update"
 msgstr ""
 
-#: ../rpmdrake.pm:102
-msgid "Software Update"
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
 msgstr ""
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 
-#: ../rpmdrake.pm:130
-#, fuzzy
+#: ../rpmdrake.pm:132
+#, fuzzy, c-format
 msgid "User name:"
 msgstr "Օգտագործողի անուն"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr ""
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr ""
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Ոչ"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Այո"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Ավստրիա"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Ավստրալիա"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Բելգիա"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Բրազիլիա"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Կանադա"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Շվեյցարիա"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Կոստա Րիկա"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Չեխական Հանրապետություն"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Գերմանիա"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Հունաստան"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Իսպանիա"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Ֆինլանդիա"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Ֆրանսիա"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Հունգարիա"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Իսրաել"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Իտալիա"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Ճապոնիա"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Հոլանդիա"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Նորվեգիա"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Լեհաստան"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Պորտուգալիա"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Շվեդիա"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Սինգապուր"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr ""
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Թայվան"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Միացիալ Թագավորություն"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Չինաստան"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Միացիալ Նահանգներ"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1863,7 +2384,8 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1871,25 +2393,28 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -1899,7 +2424,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -1909,14 +2434,17 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr ""
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -1926,63 +2454,68 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr ""
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:661
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:656
+#, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "Համակարգը անջատվում է..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr ""
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -1992,29 +2525,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr ""
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr ""
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr ""
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2022,51 +2555,55 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 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 4cbb995e..e81a013c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -17,20 +17,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 09:56+0100\n"
-"PO-Revision-Date: 2006-12-02 11:22+0700\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
+"PO-Revision-Date: 2007-01-07 07:52+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.6\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Pilih jenis media"
 
 #: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -56,15 +59,17 @@ msgstr ""
 "melakukanya dalam dua tahap.)"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Distribusi sumber (source)"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Update resmi"
 
 #: ../edit-urpm-sources.pl:97
-#, perl-format
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -82,85 +87,104 @@ msgstr ""
 "\n"
 "Apakah ok untuk dilanjutkan?"
 
-#. because updates media do not provide media.cfg yet
 #: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Harap tunggu, menambahkan media..."
 
 #: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Tambah sebuah media"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "File lokal"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Path:"
 
 #: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Server FTP"
 
 #: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:416
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
 #: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "Server RSYNC"
 
 #: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Server HTTP"
 
 #: ../edit-urpm-sources.pl:150
-msgid "Path or mount point:"
-msgstr "Path atau titik mount:"
-
-#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Perangkat portabel"
 
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Path atau titik mount:"
+
 #: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Jelajah..."
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:197 ../edit-urpm-sources.pl:501 ../rpmdrake.pm:131
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Katasandi:"
 
-#: ../edit-urpm-sources.pl:202 ../edit-urpm-sources.pl:417
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Path relatif terhadap sintesa/hdlist:"
 
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Jika kosong, sintesa/hdlist akan dideteksi secara otomatis"
 
-#: ../edit-urpm-sources.pl:209
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Nama:"
 
-#: ../edit-urpm-sources.pl:217
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Buat media untuk semua distribusi"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Cari pada media ini untuk update"
 
-#: ../edit-urpm-sources.pl:238
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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:242
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -168,227 +192,272 @@ msgstr ""
 "Sudah ada media dengan nama tersebut. Apakah Anda \n"
 "yakin akan menimpanya?"
 
-#: ../edit-urpm-sources.pl:253
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Penambahan sebuah media:"
 
-#: ../edit-urpm-sources.pl:255
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Jenis media:"
 
-#: ../edit-urpm-sources.pl:263 ../edit-urpm-sources.pl:338
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:453
-#: ../edit-urpm-sources.pl:518 ../edit-urpm-sources.pl:600
-#: ../edit-urpm-sources.pl:640 ../edit-urpm-sources.pl:698
-#: ../edit-urpm-sources.pl:837 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:1921 ../rpmdrake:1929 ../rpmdrake.pm:287 ../rpmdrake.pm:596
-#: ../rpmdrake.pm:681 ../rpmdrake.pm:754
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../edit-urpm-sources.pl:265 ../edit-urpm-sources.pl:340
-#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:508
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:639
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:763
-#: ../edit-urpm-sources.pl:830 ../edit-urpm-sources.pl:883
-#: ../edit-urpm-sources.pl:1032 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:977 ../rpmdrake:982 ../rpmdrake:1827 ../rpmdrake:1921
-#: ../rpmdrake:2068 ../rpmdrake.pm:122 ../rpmdrake.pm:227 ../rpmdrake.pm:289
-#: ../rpmdrake.pm:596
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Opsi umum untuk installasi paket"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "selalu"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "tidak pernah"
 
-#: ../edit-urpm-sources.pl:334
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifikasi RPM yang akan diinstall:"
 
-#: ../edit-urpm-sources.pl:335
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Download program untuk digunakan:"
 
-#: ../edit-urpm-sources.pl:365
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Penghapusan Sumber"
 
-#: ../edit-urpm-sources.pl:366
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Apakah Anda yakin akan menghapus sumber \"%s\"?"
 
-#: ../edit-urpm-sources.pl:371
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Harap tunggu, menghapus media..."
 
-#: ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Edit sebuah media"
 
-#: ../edit-urpm-sources.pl:413
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Mengedit media \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
 msgid "Downloader:"
 msgstr "Alat Download:"
 
-#: ../edit-urpm-sources.pl:430
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Simpan perubahan"
 
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:1019
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Anda harus memasukkan media untuk melanjutkan"
 
-#: ../edit-urpm-sources.pl:452
+#: ../edit-urpm-sources.pl:450
+#, 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:473
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Konfigurasikan proxy"
 
-#: ../edit-urpm-sources.pl:484
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Setting proxy untuk media \"%s\""
 
-#: ../edit-urpm-sources.pl:485
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Setting global proxy"
 
-#: ../edit-urpm-sources.pl:487
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
 "Jika perlu proxy, masukkan nama host dan port (syntax: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:490
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Nama host proxy:"
 
-#: ../edit-urpm-sources.pl:493
+#: ../edit-urpm-sources.pl:491
+#, 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:496
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Pengguna:"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Tambah grup parallel"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Edit grup parallel"
 
-#: ../edit-urpm-sources.pl:579
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Tambah batas media"
 
-#: ../edit-urpm-sources.pl:591
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Pilihlah media untuk ditambahkan pada batasan media:"
 
-#: ../edit-urpm-sources.pl:628
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Tambah sebuah host"
 
-#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:632
+#, 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:665
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Mengedit grup parallel \"%s\":"
 
-#: ../edit-urpm-sources.pl:669
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Nama grup:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../edit-urpm-sources.pl:672
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Batas media:"
 
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Tambah"
 
-#: ../edit-urpm-sources.pl:678 ../edit-urpm-sources.pl:685
-#: ../edit-urpm-sources.pl:743 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Hapus"
 
-#: ../edit-urpm-sources.pl:679
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Host:"
 
-#: ../edit-urpm-sources.pl:713
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfigurasikan urpmi parallel (eksekusi urpmi secara terdistribusi)"
 
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grup"
 
-#: ../edit-urpm-sources.pl:716
-msgid "Media limit"
-msgstr "Batasan media"
-
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../edit-urpm-sources.pl:717
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Batasan media"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Perintah"
 
-#: ../edit-urpm-sources.pl:727 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:886 ../rpmdrake:1748
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(tidak ada)"
 
-#: ../edit-urpm-sources.pl:747 ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Edit..."
 
-#: ../edit-urpm-sources.pl:755 ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Tambah..."
 
-#: ../edit-urpm-sources.pl:771
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Mengelola kunci untuk tanda tangan digital paket"
 
-#: ../edit-urpm-sources.pl:775 ../edit-urpm-sources.pl:932
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Media"
 
 #: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -396,29 +465,33 @@ msgstr ""
 "_:kunci kriptografi\n"
 "Kunci"
 
-#: ../edit-urpm-sources.pl:799
+#: ../edit-urpm-sources.pl:803
+#, 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:812
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Tambah sebuah kunci"
 
-#: ../edit-urpm-sources.pl:824
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Pilihlah kunci untuk ditambahkan pada media %s"
 
-#: ../edit-urpm-sources.pl:833
+#: ../edit-urpm-sources.pl:834
+#, c-format
 msgid "Close"
 msgstr "Tutup"
 
-#: ../edit-urpm-sources.pl:855
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Hapus sebuah kunci"
 
-#: ../edit-urpm-sources.pl:853
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -426,32 +499,38 @@ msgstr ""
 "Apakah Anda yakin akan menghapus kunci %s dari media %s?\n"
 "(nama kunci : %s)"
 
-#: ../edit-urpm-sources.pl:871
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Menambah sebuah kunci..."
 
-#: ../edit-urpm-sources.pl:875
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Hapus kunci"
 
-#: ../edit-urpm-sources.pl:891
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Konfigurasikan media"
 
-#: ../edit-urpm-sources.pl:930
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Aktifkan?"
 
-#: ../edit-urpm-sources.pl:931
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Update?"
 
-#: ../edit-urpm-sources.pl:947
+#: ../edit-urpm-sources.pl:951
+#, c-format
 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:977
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -461,32 +540,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1011
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Tambah kustomisasi..."
 
-#: ../edit-urpm-sources.pl:1015
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Update..."
 
-#: ../edit-urpm-sources.pl:1018
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Mengelola kunci..."
 
-#: ../edit-urpm-sources.pl:1020
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Parallel..."
 
-#: ../edit-urpm-sources.pl:1021
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Opsi umum..."
 
-#: ../edit-urpm-sources.pl:1031 ../rpmdrake:1428
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../edit-urpm-sources.pl:1047 ../gurpmi.addmedia:98 ../rpmdrake:2144
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -496,7 +581,8 @@ msgstr ""
 "\n"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../edit-urpm-sources.pl:1050
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -510,7 +596,8 @@ msgstr ""
 "pakai pada komputer Anda, yang kemudian dapat digunakan untuk menginstal\n"
 "perangkat lunak baru atau melakukan proses update"
 
-#: ../edit-urpm-sources.pl:1063
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -523,11 +610,12 @@ msgstr ""
 "paket juga?)."
 
 #: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Tidak dapat menambahkan media, kesalahan atau kekurangan argumen"
 
 #: ../gurpmi.addmedia:102
-#, perl-format
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -538,7 +626,7 @@ msgstr ""
 "kedalam sistem Anda dari media baru."
 
 #: ../gurpmi.addmedia:105
-#, perl-format
+#, c-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"
@@ -549,21 +637,22 @@ msgstr ""
 "kedalam sistem Anda dari media baru."
 
 #: ../gurpmi.addmedia:130
-#, perl-format
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Penambahan media %s sukses."
 
 #: ../gurpmi.addmedia:131
-#, perl-format
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Penambahan media `%s' sukses."
 
 #: ../rpmdrake:39
-#, perl-format
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Pemakaian: %s [OPSI]..."
 
 #: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -572,10 +661,12 @@ msgstr ""
 "jendela deskripsi"
 
 #: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     batasi pada media yang diberikan"
 
 #: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
@@ -583,26 +674,31 @@ msgstr ""
 "yang ditemukan"
 
 #: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            menentukan mode (install (default), hapus, update)"
 
 #: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      jangan tanya pertanyaan konfirmasi dalam mode update"
 
 #: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update       jangan update media saat di awal"
 
 #: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 "  --no-verify-rpm          tidak melakukan verifikasi tanda tangan paket"
 
 #: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -611,26 +707,32 @@ msgstr ""
 "gunakan \"host\" untuk menampilkan ketergantungan yang diperlukan"
 
 #: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    hanya menampilkan paket ini"
 
 #: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      pilih dahulu paket ini"
 
 #: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 paksa untuk dijalankan sebagai root"
 
 #: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           jalankan pencarian untuk \"pkg\""
 
 #: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Jalankan dalam modus pengguna"
 
 #: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -641,70 +743,86 @@ msgstr ""
 "menjelajah database yang ada."
 
 #: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Aksesibilitas"
 
 #: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
 #: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Pengarsipan"
 
 #: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Backup"
 
 #: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Pembakar CD"
 
 #: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Kompresi"
 
 #: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
 #: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
 #: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Lainnya"
 
 #: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
 #: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Buku"
 
 #: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Buku komputer"
 
 #: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "FAQ"
 
 #: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howto"
 
 #: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Literatur"
 
 #: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Kluster"
 
 #: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Pengiriman Pesan"
 
 #: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Antrian Layanan"
 
 #: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Komunikasi"
 
 #: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Basis data"
 
@@ -712,245 +830,302 @@ msgstr "Basis data"
 #: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
 #: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Pengembangan"
 
 #: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
 #: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
 #: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME dan GTK+"
 
 #: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
 #: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE dan Qt"
 
 #: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
 #: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
 #: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
 #: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
 #: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editor"
 
 #: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Pendidikan"
 
 #: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulator"
 
 #: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Perkakas file"
 
 #: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
 #: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
 #: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Permainan"
 
 #: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Petualangan"
 
 #: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
 #: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Papan"
 
 #: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kartu"
 
 #: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Teka-teki"
 
 #: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Olahraga"
 
 #: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategi"
 
 #: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
 #: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
 #: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Desktop grafis"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "berbasis FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
 #: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafik"
 
 #: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Pemantauan"
 
 #: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
 #: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
 #: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
 #: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
 #: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Jaringan"
 
 #: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
 #: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Transfer file"
 
 #: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
 #: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Pesan instan"
 
 #: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Surat"
 
 #: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Berita"
 
 #: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Akses remote"
 
 #: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
 #: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Kantor"
 
 #: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Kunci Publik"
 
 #: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Penerbitan"
 
 #: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
 #: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
 #: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Ilmu pengetahuan"
 
 #: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomi"
 
 #: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologi"
 
 #: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Kimia"
 
 #: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Ilmu komputer"
 
 #: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geosains"
 
 #: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
 #: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fisika"
 
 #: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shell"
 
 #: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Suara"
 
@@ -960,315 +1135,395 @@ msgstr "Suara"
 #: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
 #: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
 #: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistem"
 
 #: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Dasar"
 
 #: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
 #: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Konfigurasi"
 
 #: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Boot dan Init"
 
 #: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Perangkat keras"
 
 #: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pemaketan"
 
 #: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Pencetakan"
 
 #: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Pengembangan"
 
 #: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Pengembangan"
 
 #: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
 #: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Font"
 
 #: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsol"
 
 #: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
 #: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
 #: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
 #: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internasionalisasi"
 
 #: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel dan perangkat keras"
 
 #: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Pustaka"
 
 #: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Server"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
 #: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminal"
 
 #: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Perkakas teks"
 
 #: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Mainan"
 
-#. for Mandriva Choice:
 #: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
 #: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
 #: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
 msgid "Workstation"
 msgstr "Workstation"
 
 #: ../rpmdrake:339
+#, c-format
 msgid "Console Tools"
 msgstr "Perangkat Konsol"
 
 #: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
 msgid "Documentation"
 msgstr "Dokumentasi"
 
 #: ../rpmdrake:341
+#, c-format
 msgid "Game station"
 msgstr "Tempat permainan"
 
 #: ../rpmdrake:342
+#, c-format
 msgid "Internet station"
 msgstr "Tempat internet"
 
 #: ../rpmdrake:343
+#, c-format
 msgid "Multimedia station"
 msgstr "Tempat multimedia"
 
 #: ../rpmdrake:344
+#, c-format
 msgid "Network Computer (client)"
 msgstr "Jaringan Komputer (klien)"
 
 #: ../rpmdrake:345
+#, c-format
 msgid "Office Workstation"
 msgstr "Workstation Kantor"
 
 #: ../rpmdrake:346
+#, c-format
 msgid "Scientific Workstation"
 msgstr "Workstation Ilmiah"
 
 #: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
 #: ../rpmdrake:352
+#, c-format
 msgid "Graphical Environment"
 msgstr "Lingkungan Grafis"
 
 #: ../rpmdrake:349
+#, c-format
 msgid "GNOME Workstation"
 msgstr "Workstation GNOME"
 
 #: ../rpmdrake:350
+#, c-format
 msgid "IceWm Desktop"
 msgstr "Desktop IceWm"
 
 #: ../rpmdrake:351
+#, c-format
 msgid "KDE Workstation"
 msgstr "Workstation KDE"
 
 #: ../rpmdrake:352
+#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Desktop Grafis Lainnya"
 
 #: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
 #: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
 msgid "Server"
 msgstr "Server"
 
 #: ../rpmdrake:357
+#, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
 #: ../rpmdrake:358
+#, c-format
 msgid "Database"
 msgstr "Basis Data"
 
 #: ../rpmdrake:359
+#, c-format
 msgid "Firewall/Router"
 msgstr "Firewall/Router"
 
 #: ../rpmdrake:361
+#, c-format
 msgid "Mail/Groupware/News"
 msgstr "Mail/Groupware/Berita"
 
 #: ../rpmdrake:362
+#, c-format
 msgid "Network Computer server"
 msgstr "Server Jaringan Komputer"
 
 #: ../rpmdrake:363
+#, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#. - to highlight information
-#: ../rpmdrake:502 ../rpmdrake:707 ../rpmdrake:712 ../rpmdrake:726
-#: ../rpmdrake:728
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Tidak tersedia)"
 
-#: ../rpmdrake:534
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Hasil pencarian"
 
 #: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Hasil pencarian (tidak ada)"
 
-#: ../rpmdrake:545 ../rpmdrake:2125
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Harap tunggu, sedang dicari..."
 
-#: ../rpmdrake:617 ../rpmdrake:921
-msgid "Addable"
-msgstr "Dapat ditambahkan"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Manajemen Perangkat Lunak"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake:617 ../rpmdrake:921
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Dapat di-upgrade"
 
-#: ../rpmdrake:619
-msgid "Not selected"
-msgstr "Tidak terpilih"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Dapat ditambahkan"
 
 #: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Terpilih"
 
-#. is it an update?
-#: ../rpmdrake:687 ../rpmdrake:744
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Tidak terpilih"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Tingkat Kepentingan: "
 
-#: ../rpmdrake:688 ../rpmdrake:752
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Alasan untuk update: "
 
-#: ../rpmdrake:692
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Saran keamanan"
 
-#: ../rpmdrake:700 ../rpmdrake:754
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Tidak ada deskripsi"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "File:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Changelog:"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "File:\n"
 
-#: ../rpmdrake:728
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:733 ../rpmdrake.pm:807
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Media: "
 
-#: ../rpmdrake:734
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Versi aktual yang terinstall: "
 
-#: ../rpmdrake:738
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Nama: "
 
-#: ../rpmdrake:739
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versi: "
 
-#: ../rpmdrake:740
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Arsitektur: "
 
-#: ../rpmdrake:741
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:741
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Ukuran: "
 
-#. extra empty line
-#: ../rpmdrake:748
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Ringkasan: "
 
-#: ../rpmdrake:754
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Deskripsi: "
 
-#: ../rpmdrake:810 ../rpmdrake.pm:179
-msgid "Software Management"
-msgstr "Manajemen Perangkat Lunak"
-
-#: ../rpmdrake:827 ../rpmdrake:973 ../rpmdrake:975
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Informasi tambahan pada paket..."
 
-#: ../rpmdrake:829
+#: ../rpmdrake:825
+#, c-format
+msgid "Please choose"
+msgstr "Silahkan pilih"
+
+#: ../rpmdrake:825
+#, c-format
+
 msgid "One of the following packages is needed:"
 msgstr "Satu di antara paket berikut diperlukan:"
 
-#: ../rpmdrake:829
-msgid "Please choose"
-msgstr "Silahkan pilih"
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Satu di antara paket berikut diperlukan:"
 
-#: ../rpmdrake:870
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Harap tunggu, paket sedang didaftar..."
 
-#: ../rpmdrake:888
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Tidak ada update"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1277,34 +1532,41 @@ msgstr ""
 "Daftar update kosong. Artinya tidak ada update untuk paket yang\n"
 "terinstall di komputer Anda, atau Anda sudah menginstallnya."
 
-#: ../rpmdrake:912 ../rpmdrake:1174
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Semua"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:960 ../rpmdrake:965
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Info lain"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informasi pada paket"
 
-#: ../rpmdrake:991
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Beberapa paket tambahan perlu dihapus"
 
-#: ../rpmdrake:992
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Untuk memenuhi dependensi, paket-paket berikut perlu dihapus:"
 
-#: ../rpmdrake:998 ../rpmdrake:1007
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Beberapa paket tidak dapat dihapus"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1312,7 +1574,8 @@ msgstr ""
 "Maaf, menghapus paket ini berarti merusak sistem Anda:\n"
 "\n"
 
-#: ../rpmdrake:1008 ../rpmdrake:1073
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1321,145 +1584,176 @@ msgstr ""
 "Karena aspek ketergantungan, paket berikut harus tidak dipilih:\n"
 "\n"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Dibutuhkan paket tambahan"
 
-#: ../rpmdrake:1038
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr "Untuk memenuhi ketergantungan, paket berikut juga harus diinstall:\n"
 
-#: ../rpmdrake:1053
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (milik daftar yang dilewati)"
 
-#: ../rpmdrake:1056
+#: ../rpmdrake:1053
+#, c-format
+
 msgid "Some packages can't be installed"
 msgstr "Beberapa paket tidak dapat diinstall"
 
-#: ../rpmdrake:1057
-#, perl-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Beberapa paket tidak dapat diinstall"
+
+#: ../rpmdrake:1054
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "Maaf, paket berikut tidak dapat dipilih:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:1072 ../rpmdrake:1896
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Beberapa paket perlu dihapus"
 
-#: ../rpmdrake:1101
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Terpilih: %s / Ruang disk kosong: %s"
 
-#: ../rpmdrake:1102
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Ukuran terpilih: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:1107
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Deskripsi tidak tersedia untuk paket ini\n"
 
-#: ../rpmdrake:1113 ../rpmdrake:1506
-#, perl-format
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Kesalahan fatal terjadi: %s."
 
-#: ../rpmdrake:1174
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Terinstall"
 
-#: ../rpmdrake:1174
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Tidak ada yang terinstall"
 
-#: ../rpmdrake:1175
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s pilihan"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Pilihan Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1177
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Semua paket, menurut abjad"
 
-#: ../rpmdrake:1178
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Semua paket, menurut ketersediaan update"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Semua paket, menurut ukuran"
 
-#: ../rpmdrake:1180
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Semua paket, menurut status pilihan"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Cabang saja, diurutkan berdasarkan tanggal installasi"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Semua paket, menurut grup"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Semua update"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Update keamanan"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Update bugfix"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Update normal"
 
-#: ../rpmdrake:1184
-msgid "Security updates"
-msgstr "Update keamanan"
-
-#: ../rpmdrake:1247
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "dalam nama"
 
-#: ../rpmdrake:1249
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "dalam deskripsi"
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "dalam nama file"
 
-#: ../rpmdrake:1278
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Kesalahan: %s tampaknya di-mount sebagai read-only."
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Anda harus memilih beberapa paket dahulu."
 
-#: ../rpmdrake:1287
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Terlalu banyak paket yang dipilih"
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1285
+#, 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"
@@ -1475,144 +1769,175 @@ msgstr ""
 "\n"
 "Benarkah Anda ingin menginstal semua paket terpilih?"
 
-#: ../rpmdrake:1320 ../rpmdrake:1323 ../rpmdrake:1334 ../rpmdrake:1347
-#: ../rpmdrake:1356
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_File"
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Update media"
 
-#: ../rpmdrake:1334
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Reset yang dipilih"
 
-#: ../rpmdrake:1347
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Reload daftar _paket"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Keluar"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>K"
 
-#: ../rpmdrake:1359 ../rpmdrake:1360 ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Opsi"
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Manajer Media"
 
-#: ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Tunjukkan paket yang sudah dipilih secara otomatis"
 
-#: ../rpmdrake:1367 ../rpmdrake:1368 ../rpmdrake:1369 ../rpmdrake:1370
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/Ban_tuan"
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Laporkan Kesalahan"
 
-#: ../rpmdrake:1370
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Tentang..."
 
-#. nicer formatting
-#: ../rpmdrake:1373
+#: ../rpmdrake:1370
+#, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:1375
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hak Cipta (C) %s oleh Mandriva"
 
-#: ../rpmdrake:1377
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake adalah perangkat manajemen paket Mandriva Linux."
 
-#: ../rpmdrake:1379
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1384
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 
-#: ../rpmdrake:1408
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Cari:"
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Cari"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Bersihkan"
 
-#: ../rpmdrake:1433 ../rpmdrake.pm:758
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
 msgid "Select all"
 msgstr "Pilih semua"
 
-#: ../rpmdrake:1440
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Terapkan"
 
-#: ../rpmdrake:1444
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Perkenalan Singkat"
 
-#: ../rpmdrake:1461
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "Anda bisa menjelajahi paket melalui pohon kategori pada sisi kiri."
 
-#: ../rpmdrake:1462
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Anda bisa melihat informasi tentang sebuah paket dengan meng-klik pada "
 "daftar sebelah kanan."
 
-#: ../rpmdrake:1463
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "Untuk menginstall, mengupdate, atau menghapus sebuah paket, cukup klik pada "
 "\"checkbox\"."
 
 #: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Kesalahan fatal"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
-msgid "Initializing..."
-msgstr "Inisialisasi..."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Harap tunggu"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
 msgid "Package installation..."
 msgstr "Installasi paket..."
 
-#: ../rpmdrake:1507 ../rpmdrake:1932 ../rpmdrake.pm:311
-msgid "Please wait"
-msgstr "Harap tunggu"
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Inisialisasi..."
 
-#: ../rpmdrake:1530 ../rpmdrake:1918
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Konfirmasi"
 
-#: ../rpmdrake:1532
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1624,12 +1949,13 @@ msgstr ""
 "\n"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../rpmdrake:1541
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Media update sudah ada"
 
-#: ../rpmdrake:1542
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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,12 +1971,13 @@ msgstr ""
 "\n"
 "Lalu jalankan ulang %s."
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Bagaimana memilih mirror secara manual"
 
-#: ../rpmdrake:1554
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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,64 +1991,73 @@ msgstr ""
 "\n"
 "Lalu, jalankan ulang %s."
 
-#: ../rpmdrake:1567
+#: ../rpmdrake:1570
+#, c-format
 msgid "Reading updates description"
 msgstr "Membaca deskripsi update"
 
-#: ../rpmdrake:1593 ../rpmdrake:1670
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Harap tunggu, mencari paket yang tersedia..."
 
-#: ../rpmdrake:1601
+#: ../rpmdrake:1604
+#, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Harap tunggu, mendaftar paket-paket dasar..."
 
-#: ../rpmdrake:1637
+#: ../rpmdrake:1640
+#, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Harap tunggu, mencari paket-paket yang terinstall..."
 
-#: ../rpmdrake:1771
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Memeriksa %s"
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "perubahan:"
 
-#: ../rpmdrake:1780
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Hapus .%s"
 
-#: ../rpmdrake:1784
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Gunakan .%s sebagai file utama"
 
-#: ../rpmdrake:1788
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Tidak lakukan apa-apa"
 
-#: ../rpmdrake:1804
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Installasi selesai"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Memeriksa..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1852 ../rpmdrake:2045
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Semua paket yang diminta telah sukses diinstall."
 
-#: ../rpmdrake:1856 ../rpmdrake:2025
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Masalah saat installasi"
 
-#: ../rpmdrake:1857 ../rpmdrake:2026 ../rpmdrake:2084
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1731,17 +2067,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1876
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Tidak dapat mendapatkan paket source."
 
-#: ../rpmdrake:1877
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Tidak dapat mendapatkan paket source. %s"
 
-#: ../rpmdrake:1878 ../rpmdrake:1976
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1753,60 +2090,67 @@ msgstr ""
 "Kesalahan yang dilaporkan:\n"
 "%s"
 
-#: ../rpmdrake:1894
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
-"Untuk memenuhi ketergantungan, paket %d berikut juga harus diinstal:\n"
+msgstr[0] ""
+"Untuk memenuhi ketergantungan, paket-paket %d berikut juga harus diinstal:\n"
 "%s\n"
 
-#: ../rpmdrake:1898
-#, perl-format
-msgid "Remove %d packages?"
-msgstr "Hapus paket %d?"
+#: ../rpmdrake:1926
+#, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Hapus paket-paket %d?"
 
-#: ../rpmdrake:1899
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
+#: ../rpmdrake:1927
+#, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Paket berikut harus dihapus agar yang lain dapat diupgrade:"
+
+#: ../rpmdrake:1927
+#, c-format
+msgid "Is it ok to continue?"
 msgstr ""
-"Paket berikut harus dihapus agar yang lain dapat diupgrade:\n"
-"\n"
-"%s\n"
-"\n"
-"Apakah ok untuk dilanjutkan?"
+"Apakah ok untuk melanjutkan?"
 
-#: ../rpmdrake:1941
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Ubah media"
 
-#: ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Masukkan media \"%s\" ke divais [%s]"
 
-#: ../rpmdrake:1927
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Mendownload packet `%s' (%s/%s)..."
 
-#: ../rpmdrake:1947
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Memverifikasi tanda tangan paket..."
 
-#: ../rpmdrake:1960 ../rpmdrake.pm:737 ../rpmdrake.pm:846
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../rpmdrake:1961
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1820,12 +2164,13 @@ msgstr ""
 "\n"
 "Apakah Anda hendak melanjutkan installasi?"
 
-#: ../rpmdrake:1973 ../rpmdrake:2083
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Installasi gagal"
 
-#: ../rpmdrake:1974
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1837,25 +2182,28 @@ msgstr ""
 "\n"
 "Anda mungkin perlu meng-update basis data media."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Persiapan installasi paket..."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Persiapan..."
 
-#: ../rpmdrake:1991
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Menginstall paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:2006
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "tidak bisa mengakses file rpm [%s]"
 
-#: ../rpmdrake:2040
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1868,42 +2216,49 @@ msgstr ""
 "rpmsave',\n"
 "Anda mungkin perlu memeriksanya sekarang untuk bertindak selanjutnya:"
 
-#: ../rpmdrake:2048
+#: ../rpmdrake:2073
+#, c-format
 msgid "Upgrade information"
 msgstr "Informasi upgrade"
 
-#: ../rpmdrake:2050
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Paket berikut datang dengan informasi upgrade"
 
-#: ../rpmdrake:2058
+#: ../rpmdrake:2083
+#, c-format
 msgid "Upgrade information about this package"
 msgstr "Informasi upgrade tentang paket ini"
 
-#: ../rpmdrake:2061
-#, perl-format
+#: ../rpmdrake:2086
+#, c-format
 msgid "Upgrade information about package %s"
 msgstr "Informasi upgrade tentang paket %s"
 
-#: ../rpmdrake:2073 ../rpmdrake.pm:724 ../rpmdrake.pm:805 ../rpmdrake.pm:829
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Kesalahan"
 
-#: ../rpmdrake:2074
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 "Kesalahan tidak terpulihkan: tidak ada paket yang ditemukan untuk installasi."
 
-#: ../rpmdrake:2099
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Harap tunggu, menghapus paket..."
 
-#: ../rpmdrake:2110
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Masalah saat penghapusan"
 
-#: ../rpmdrake:2111
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1913,11 +2268,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2143
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Selamat datang"
 
-#: ../rpmdrake:2148
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1929,8 +2286,8 @@ msgstr ""
 "Peralatan ini membantu Anda memilih perangkat lunak yang ingin Anda hapus\n"
 "dari komputer Anda."
 
-#: ../rpmdrake:2153
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1942,11 +2299,13 @@ msgstr ""
 "Perkakas ini membantu Anda memilih update yang ingin Anda install pada\n"
 "komputer Anda."
 
-#: ../rpmdrake:2158
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Selamat datang pada perkakas installasi perangkat lunak!"
 
-#: ../rpmdrake:2159
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1961,171 +2320,213 @@ msgstr ""
 "yang\n"
 "hendak diinstall pada komputer Anda."
 
-#: ../rpmdrake.pm:103
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Update Perangkat Lunak"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Silahkan masukkan kredensial Anda untuk mengakses proxy\n"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Nama pengguna:"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Penghapusan Paket Perangkat Lunak"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Update Paket Perangkat Lunak"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Installasi Paket Perangkat Lunak"
 
-#: ../rpmdrake.pm:218
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Tidak"
 
-#: ../rpmdrake.pm:222
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Ya"
 
-#: ../rpmdrake.pm:272
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Swiss"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Republik Ceko"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Jerman"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Denmark"
 
-#: ../rpmdrake.pm:399 ../rpmdrake.pm:403
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Yunani"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Spanyol"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Perancis"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Hungaria"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Jepang"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Belanda"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polandia"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Swedia"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Inggris"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Cina"
 
-#: ../rpmdrake.pm:420 ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Amerika Serikat"
 
-#: ../rpmdrake.pm:520
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2137,7 +2538,8 @@ msgstr ""
 "\n"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2149,25 +2551,28 @@ msgstr ""
 "\n"
 "Apakah ok untuk dilanjutkan?"
 
-#: ../rpmdrake.pm:530 ../rpmdrake.pm:568
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Pilihan mirror"
 
-#: ../rpmdrake.pm:533
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Harap tunggu, mendownload alamat-alamat mirror."
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Harap tunggu, mendownload alamat-alamat mirror dari website Mandriva."
 
-#. - seems that value is bitten before being printed by next func..
-#: ../rpmdrake.pm:541
+#: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Kesalahan saat download"
 
-#: ../rpmdrake.pm:543
-#, perl-format
+#: ../rpmdrake.pm:544
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2181,8 +2586,8 @@ msgstr ""
 "Jaringan, atau website Mandriva mungkin tidak tersedia.\n"
 "Silakan coba lagi nanti."
 
-#: ../rpmdrake.pm:548
-#, perl-format
+#: ../rpmdrake.pm:549
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2196,15 +2601,18 @@ msgstr ""
 "Jaringan, atau website Mandriva mungkin tidak tersedia.\n"
 "Harap coba lagi nanti."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Tidak ada mirror"
 
-#: ../rpmdrake.pm:560
+#: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Mirror yang cocok tidak dapat ditemukan."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2218,64 +2626,69 @@ msgstr ""
 "arsitektur\n"
 "prosesor Anda tidak didukung oleh Update Resmi Mandriva Linux."
 
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Pilihlah mirror yang diinginkan."
 
-#: ../rpmdrake.pm:633
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Menyalin file untuk media `%s'..."
 
-#: ../rpmdrake.pm:636
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Memeriksa file dari media `%s'..."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Memeriksa file remote media `%s'..."
 
-#: ../rpmdrake.pm:643
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " selesai."
 
-#: ../rpmdrake.pm:647
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " gagal!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:651
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s dari media %s"
 
-#: ../rpmdrake.pm:655
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Download `%s' dimulai..."
 
-#: ../rpmdrake.pm:659
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download `%s', waktu yang dibutuhkan:%s, kecepatan:%s"
 
-#: ../rpmdrake.pm:662
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download `%s', kecepatan:%s"
 
-#: ../rpmdrake.pm:673
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Harap tunggu, mengupdate media..."
 
-#: ../rpmdrake.pm:700
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Kesalahan menerima paket"
 
-#: ../rpmdrake.pm:701
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2291,27 +2704,31 @@ msgstr ""
 "tersedia dan Anda harus mencoba\n"
 "ulang nanti."
 
-#: ../rpmdrake.pm:732
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Media update"
 
-#: ../rpmdrake.pm:737
+#: ../rpmdrake.pm:739
+#, c-format
 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:744
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Pilih media yang ingin di-update:"
 
-#: ../rpmdrake.pm:762
+#: ../rpmdrake.pm:764
+#, c-format
 msgid "Update"
 msgstr "Update"
 
-#: ../rpmdrake.pm:783
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2323,8 +2740,8 @@ msgstr ""
 "Kesalahan:\n"
 "%s"
 
-#: ../rpmdrake.pm:806 ../rpmdrake.pm:817
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2334,16 +2751,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:829
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Gagal membuat media."
 
-#: ../rpmdrake.pm:834
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Kesalahan ketika menambahkan media"
 
-#: ../rpmdrake.pm:835
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2353,8 +2772,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:848
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2364,8 +2783,8 @@ msgstr ""
 "%s yang Anda jalankan (%s).\n"
 "Mediumnya akan di non-aktifkan."
 
-#: ../rpmdrake.pm:851
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2375,11 +2794,13 @@ msgstr ""
 "Mandriva Linux yang Anda pakai (%s).\n"
 "Akan dinonaktifkan."
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Bantuan diluncurkan di belakang"
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2667,9 +3088,6 @@ msgstr "Manajer Media Perangkat Lunak"
 #~ msgid "No package found for installation."
 #~ msgstr "Tidak ditemukan paket untuk installasi."
 
-#~ msgid "Stop"
-#~ msgstr "Stop"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "Semua paket, menurut repositori media"
 
diff --git a/po/it.po b/po/it.po
index f32f7170..9bc3fcbb 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-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-09-11 22:40+0200\n"
 "Last-Translator: Andrea Celli <a.celli@caltanet.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -25,12 +25,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Scegli il tipo di supporto"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -53,16 +56,18 @@ msgstr ""
 "distribuzione. \n"
 " (Puoi aggiungerli entrambi, ma devi farlo in due occasioni.) "
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Supporti della Distribuzione"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Aggiornamenti ufficiali"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -79,84 +84,104 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Attendere, aggiornamento dei supporti in corso..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Aggiungi un supporto"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "File locali"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Percorso:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "Server RSYNC"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Server HTTP"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Percorso o punto di mount:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Dispositivo rimovibile"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Percorso o punto di mount:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Sfoglia..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Password:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Percorso relativo di synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Se lasciato vuoto, synthesis/hdlist verrà cercato automaticamente"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Crea un supporto per l'intera distribuzione"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Fonte in cui cercare gli aggiornamenti:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -164,109 +189,132 @@ msgstr ""
 "C'è già un supporto con quel nome, vuoi\n"
 "veramente sostituirlo?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Aggiunta di un supporto:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Tipo di supporto:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Opzioni globali per l'installazione dei pacchetti"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "sempre"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "mai"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifica gli RPM da installare"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Programma per eseguire il download:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Rimozione Supporto"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Vuoi davvero rimuovere il supporto \"%s\"?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Attendere, è in corso la rimozione del supporto..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Modifica un supporto"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Modifica supporto \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Salva le modifiche"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Inserisci il supporto per continuare"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Configurazione del proxy"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Parametri Proxy per il supporto \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Parametri globali per il proxy"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -274,139 +322,173 @@ msgstr ""
 "Se devi usare un proxy, digitane il nome ed eventualmente la porta "
 "(sintassi: <nomeproxy[:porta]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Nome host del proxy:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Utente:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Aggiungi un gruppo parallelo"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Modifica un gruppo parallelo"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Aggiungi un supporto all'elenco"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Scegli un supporto da aggiungere all'elenco:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Aggiungi un host"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Modifica del gruppo parallelo \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Nome del gruppo:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Elenco supporti ammessi:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Host:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configura urpmi in parallelo (esecuzione distribuita di urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Limite supporti"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Limite supporti"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Comando"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(nessuna)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Aggiungi..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Gestione delle chiavi per le firme digitali dei pacchetti"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Supporti"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Chiavi"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Aggiungi chiave"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Scegli una chiave da aggiungere al supporto %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Chiudi"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Rimozione chiave"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -414,34 +496,40 @@ msgstr ""
 "Vuoi davvero rimuovere la chiave %s dal supporto %s?\n"
 "(nome della chiave: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Aggiungi chiave..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Rimuovi chiave"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Configura i supporti"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Abilitata?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Aggiornare?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Questo supporto deve essere aggionato per renderlo utilizzabile? Lo "
 "aggiorniamo ora?"
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -451,32 +539,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Aggiungi personalizzato..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Aggiorna..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Gestione chiavi..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "In parallelo..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Opzioni globali..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Guida"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -486,7 +580,8 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -501,7 +596,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -512,12 +608,13 @@ 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:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Impossibile aggiungere il supporto, parametri errati o incompleti"
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -527,8 +624,8 @@ msgstr ""
 "Ciò significa che potrai aggiungere nuovi pacchetti\n"
 "software al tuo sistema prendendoli da queste fonti."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -538,22 +635,23 @@ msgstr ""
 "Ciò significa che potrai aggiungere nuovi pacchetti\n"
 "software al tuo sistema prendendoli da questa fonte."
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "È riuscita l'aggiunta delle fonti %s."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "È riuscita l'aggiunta della fonte \"%s\"."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Uso: %s [OPZIONE]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -561,39 +659,46 @@ msgstr ""
 "  --changelog-first      mostra nella finestra con la descrizione l'elenco "
 "dei cambiamenti prima dell'elenco dei file"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     usa solo le fonti nell'elenco"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     propone di fondere tutti i file .rpmnew/.rpmsave "
 "che trova"
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODALITÀ            imposta la modalità (install (predefinito), "
 "remove, update)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      non chiede una conferma preventiva durante gli "
 "aggiornamenti"
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      non aggiorna i supporti all'avvio"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        non verifica le firme dei pacchetti"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -601,27 +706,33 @@ msgstr ""
 "  --parallel=alias,host  lavora in parallelo, usa il gruppo \"alias\" e il "
 "server \"host\" per risolvere le dipendenze"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    mostra solo questi pacchetti"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      preseleziona questi pacchetti"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 forza l'esecuzione come root"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           esegui la ricerca di \"pkg\""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "In esecuzione in modo utente"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -631,545 +742,785 @@ msgstr ""
 "Non potrai apportare modifiche al sistema, ma\n"
 "potrai comunque sfogliare il database esistente."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Accessibilità"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Archiviazione"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Masterizzazione"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Compressione"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Altro"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Libri"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Libri d'informatica"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "FAQ"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howto"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Letteratura"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Trasferimento dei messaggi"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Servizi di accodamento"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Comunicazioni"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Database"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Sviluppo"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME e GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE e QT"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editor"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Educazione"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Gestione file"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Giochi"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Avventure"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Schede"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Schede"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Rompicapo"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategia"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Desktop grafico"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "Basato su FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafica"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Monitoraggio"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Rete"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Trasferimento file"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Messaggi istantanei"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Posta"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "News"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Accesso remoto"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Ufficio"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Chiavi Pubbliche"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Editoria"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Scienze"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Chimica"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Informatica"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Scienze della terra"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematica"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fisica"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Suono"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistema"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Base"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Boot e init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pacchetti"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Stampa in corso"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Installazione"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Installazione"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Font"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Console"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Localizzazione"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel e hardware"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Librerie"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Server"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Strumenti per testi"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Giochi"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Workstation"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Programmi da riga di comando"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Documentazione"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Computer per giocare"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Computer con accesso ad Internet"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Computer multimediale"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Computer in rete (client)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Postazione di lavoro con programmi da ufficio"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Ambiente grafico"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Workstation grafica con GNOME"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "Desktop IceWm"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "Workstation grafica con KDE"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Altri desktop grafici"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Server"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Server di rete"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Non disponibile)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Risultati della ricerca"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Risultati della ricerca (nessuno)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Attendere, ricerca in corso..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Aggiungibili"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Gestione software"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr ""
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Aggiornabili"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Non selezionato"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Aggiungibili"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Selezionato"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Non selezionato"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Importanza: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Motivo dell'aggiornamento: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Annunci sulla sicurezza"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Nessuna descrizione"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "File:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Registro delle modifiche:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "File:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Registro delle modifiche:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Supporto: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Versione attualmente installata: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versione: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Architettura: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s kB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Dimensioni: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s kB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Riassunto: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Gestione software"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Ulteriori informazioni sul pacchetto..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "È necessario uno dei seguenti pacchetti:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Seleziona"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "È necessario uno dei seguenti pacchetti:"
+msgstr[1] "È necessario uno dei seguenti pacchetti:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Attendere, è in corso la creazione dell'elenco dei pacchetti..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Nessun aggiornamento"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1179,24 +1530,29 @@ msgstr ""
 "non sono disponibili aggiornamenti per i pacchetti installati sul\n"
 "tuo computer, oppure li hai già installati tutti."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Tutti"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Maggiori informazioni"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informazioni sui pacchetti"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Devono essere rimossi altri pacchetti"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1204,11 +1560,13 @@ msgstr ""
 "A causa delle loro dipendenze, devono essere rimossi anche i seguenti "
 "pacchetti:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Alcuni pacchetti non possono essere rimossi"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1216,7 +1574,8 @@ msgstr ""
 "Spiacente, la rimozione di questi pacchetti danneggerebbe il tuo sistema:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1226,11 +1585,13 @@ msgstr ""
 "deselezionati i seguenti pacchetti:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Sono necessari altri pacchetti"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1240,129 +1601,164 @@ msgstr ""
 "installati anche i seguenti pacchetti:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (appartiene alla lista di esclusioni)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Alcuni pacchetti non possono essere installati"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Alcuni pacchetti non possono essere installati"
+msgstr[1] "Alcuni pacchetti non possono essere installati"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Spiacente, i seguenti pacchetti non possono essere selezionati:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Spiacente, i seguenti pacchetti non possono essere selezionati:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Alcuni pacchetti devono essere rimossi"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Selezionati: %s / Spazio libero su disco: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Dimensione pacchetti selezionati: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "La descrizione di questo pacchetto non è disponibile\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Si è verificato un errore fatale: %s."
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Installato"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Non installato"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "% scelte"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Scelte di Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Tutti i pacchetti, in ordine alfabetico"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Tutti i pacchetti, per disponibilità di aggiornamenti"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Tutti i pacchetti, per dimensione"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Tutti i pacchetti, per stato di selezione"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Solo foglie, per data di installazione"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Tutti i pacchetti, per gruppo"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Tutti gli aggiornamenti"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Aggiornamenti per la sicurezza"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Aggiornamenti correttivi"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Aggiornamenti normali"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Aggiornamenti per la sicurezza"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "nei nomi"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "nelle descrizioni"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "nei nomi dei file"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Errore: %s sembra montato in sola lettura."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Devi prima scegliere almeno un pacchetto."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Troppi pacchetti selezionati"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1378,135 +1774,177 @@ msgstr ""
 "\n"
 "Vuoi davvero installare tutti i pacchetti selezionati?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_File"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Aggiorna supporto"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Annulla la selezione"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Ricarica la lista dei _pacchetti"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Esci"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Opzioni"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/Gestione _fonti "
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Mo_stra i pacchetti selezionati automaticamente"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Guida"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Segnala bug"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Informazioni su..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "Informazioni su Rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake è uno strumento di  Mandriva Linux per gestire i pacchetti."
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Andrea Celli <a.celli@caltanet.it>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Cerca:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Cerca"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Cancella"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Seleziona tutto"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Applica"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Esci"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Introduzione rapida"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 "Puoi cercare i pacchetti usando l'albero a sinistra, organizzato per "
 "categorie."
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Puoi vedere le informazioni relative a un pacchetto cliccando sul suo nome "
 "nell'elenco a destra."
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "Per installare, aggiornare o rimuovere un pacchetto basta cliccare sulla "
 "relativa casella."
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Errore fatale"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Si è verificato un errore fatale: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Attendere prego"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Installazione dei pacchetti..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Inizializzazione..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1518,12 +1956,13 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Supporto per gli aggiornamenti già esistente"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1539,12 +1978,13 @@ msgstr ""
 "\n"
 "Poi riavvia %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Come scegliere manualmente il mirror"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1558,56 +1998,73 @@ msgstr ""
 "\n"
 "Quindi riavvia %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "nelle descrizioni"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Attendere, è in corso la ricerca dei pacchetti disponibili..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Attendere, è in corso la lettura del database dei pacchetti..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Attendere, è in corso la creazione dell'elenco dei pacchetti..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Attendere, è in corso la ricerca dei pacchetti disponibili..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Analisi di %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "modifiche:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Rimuovi .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Usa .%s come file principale"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Non fare niente"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Installazione completata"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Esamina..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Tutti i pacchetti richiesti sono stati installati correttamente."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Si sono verificati dei problemi durante l'installazione"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1617,17 +2074,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Impossibile prelevare i pacchetti sorgenti."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Impossibile prelevare i pacchetti sorgenti. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1639,25 +2097,43 @@ msgstr ""
 "Errori riportati:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Per soddisfare le dipendenze, saranno installati i seguenti %d pacchetti :\n"
+"%s\n"
+msgstr[1] ""
 "Per soddisfare le dipendenze, saranno installati i seguenti %d pacchetti :\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Rimozione chiave"
+msgstr[1] "Rimozione chiave"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"I seguenti pacchetti devono essere rimossi affinché gli altri possano essere "
+"aggiornati:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Vuoi proseguire?"
+msgstr[1] ""
 "I seguenti pacchetti devono essere rimossi affinché gli altri possano essere "
 "aggiornati:\n"
 "\n"
@@ -1665,42 +2141,41 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Inizializzazione..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Installazione dei pacchetti..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Attendere prego"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Vuoi proseguire?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Cambia supporto"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Inserisci il supporto \"%s\" nel dispositivo [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Scarico il pacchetto \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Verifico le firme dei pacchetti..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1714,12 +2189,13 @@ msgstr ""
 "\n"
 "Vuoi proseguire con l'installazione?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Installazione fallita"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1731,25 +2207,28 @@ msgstr ""
 "\n"
 "Prova ad aggiornare il database dei supporti."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Preparazione dei pacchetti per l'installazione..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "In preparazione..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installazione del pacchetto \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "non riesco ad accedere al file rpm [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1761,33 +2240,48 @@ msgstr ""
 "Sono stati creati alcuni file di configurazione \".rpmnew\" o \".rpmsave\",\n"
 "puoi esaminarli in modo da decidere cosa fare:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Questi pacchetti sono muniti di informazioni per l'aggiornamento."
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Ulteriori informazioni sul pacchetto..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Ulteriori informazioni sul pacchetto... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Errore"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Errore fatale: non sono stati trovati pacchetti da installare."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Attendere, è in corso la rimozione dei pacchetti..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Si sono verificati dei problemi durante la rimozione"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1797,11 +2291,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Benvenuto"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1813,8 +2309,8 @@ msgstr ""
 "Questo programma ti aiuterà nella selezione del\n"
 "software che deve essere rimosso dal tuo computer."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1826,11 +2322,13 @@ msgstr ""
 "Questo programma ti aiuterà a scegliere gli aggiornamenti da\n"
 "installare sul tuo computer."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Benvenuto nel programma di installazione software!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1844,172 +2342,213 @@ msgstr ""
 "software su CD-ROM o DVD. Questo programma ti aiuterà a scegliere il\n"
 "software da installare sul tuo computer."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Aggiornamenti Software"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Inserisci i tuoi dati necessari per accedere al proxy\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Nome utente:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Rimozione Pacchetti Software"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Aggiornamento Pacchetti Software"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Installazione dei pacchetti"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "No"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Sì"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Informazioni..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasile"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Svizzera"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Repubblica Ceca"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Germania"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danimarca"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Spagna"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Francia"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Ungheria"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israele"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Giappone"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Paesi Bassi"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portogallo"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Russia"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Svezia"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovacchia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Regno Unito"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Cina"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Stati Uniti"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2021,7 +2560,8 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2034,27 +2574,30 @@ msgstr ""
 "\n"
 "Vuoi proseguire?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Scelta del mirror"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Attendere, è in corso il download degli indirizzi dei mirror."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Attendere, è in corso il download degli indirizzi dei mirror dal sito di "
 "Mandriva."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Errore durante il download"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2069,7 +2612,7 @@ msgstr ""
 "Riprova più tardi."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2084,14 +2627,17 @@ msgstr ""
 "sono disponibili. Riprova più tardi."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Nessun mirror"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Nessun mirror adeguato è disponibile."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2106,63 +2652,68 @@ msgstr ""
 "supportata dagli aggiornamenti ufficiali di Mandriva Linux."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Scegli il mirror che preferisci."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copio i file per il supporto \"%s\"..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Esamino i file del supporto \"%s\"..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Esamino il file remoto del supporto \"%s\"..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " fatto."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " fallita!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s dal supporto %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Inizio del download di \"%s\"..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download di %s, tempo rimasto: %s, velocità: %s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download di \"%s\", velocità: %s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Attendere, aggiornamento dei supporti in corso..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Errore nello scaricare i pacchetti"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2177,31 +2728,31 @@ msgstr ""
 "irraggiungibile e devi riprovare più tardi\n"
 " "
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Aggiorna supporti"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Non ci sono supporti attivi. Devi attivare qualche supporto se vuoi "
 "aggiornali."
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Seleziona i supporti che vuoi aggiornare:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Seleziona tutto"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2213,8 +2764,8 @@ msgstr ""
 "Errori:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2224,16 +2775,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Impossibile creare il supporto."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Errore nell'aggiunta del supporto"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2243,8 +2796,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2254,8 +2807,8 @@ msgstr ""
 "di %s che stai usando(%s).\n"
 "Verrà disabilitato. "
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2265,11 +2818,13 @@ msgstr ""
 "di Mandriva Linux che stai usando(%s).\n"
 "Verrà disabilitato. "
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Guida avviata in background"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2546,6 +3101,9 @@ msgstr "Rimuovi software"
 msgid "Software Media Manager"
 msgstr "Gestiore dei supporti software"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Attendere, è in corso la lettura del database dei pacchetti..."
+
 #~ msgid ""
 #~ "Because of their dependencies, the following package(s) also need to be\n"
 #~ "removed:\n"
diff --git a/po/ka.po b/po/ka.po
index adc7f6d3..f68f201f 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -6,19 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bootsplash VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -32,16 +35,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -52,399 +57,489 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "მდებარეობა:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:140
-msgid "Removable device"
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "მომხმარებელი:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "პაროლი:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "სტოპ!"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "ო-ქეი"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "დამატება"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "წაშლა"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "ჯგუფი"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Protocol"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
-msgid "Protocol"
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "ბრძანება"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(არცერთი)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "დამუშავება"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, fuzzy, c-format
+msgid "Close"
+msgstr "კონსოლი"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-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:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "დახმარება"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -453,7 +548,8 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -461,825 +557,1116 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "გამოყენება: %s [პარამეტრები]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "გამარტივება"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "არქივირება"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "მონაცემების დარეზერვება"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD-ზე ჩაწერა"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "კომპრესირება"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "სხვა"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr ""
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "კომუნიკაციები"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "მონაცემთა ბაზები"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "პროგრამირება"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr ""
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr ""
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr ""
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr ""
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr ""
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "რედაქტორები"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "განათლება"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "ემულატორები"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "ფაილის იარაღები"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "თამაშები"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "სათავგადასავლო"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "არკადია"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "დაფები"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "კარტი"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "თავსატეხები"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "სპორტი"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "სტრატეგიული"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr ""
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "გრაფიკა"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "მონიტორინგი"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "მულტიმედია"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "ვიდეო"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "ქსელში მუშაობა"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "ლაყბობა (ჩეთი)"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "ფაილის ტრანსფერი"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "მყისი შეტყობინებები"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "ელფოსტა"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "ახალი ამბები"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "დაკავშირება"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "ოფისი"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "გამოქვეყნება"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "მეცნიერება"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "ასტრონომია"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "ბიოლოგია"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "ქიმია"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "კომპიუტერული მეცნიერებები"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "გეო-მეცნიერებები"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "მათემატიკა"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "ფიზიკა"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "გარსები (Shells)"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "ხმა"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "სისტემა"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "კონფიგურაცია"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "ჩატვირთვა და ინიცირება"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "მოწყობილობა"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "ჩალაგება"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "ბეჭდვა"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr ""
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr ""
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "შრიფტები"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "კონსოლი"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "ტერმინალები"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "ტექსტის ხელსაწყოები"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "სათამაშოები"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, fuzzy, c-format
+msgid "Workstation"
+msgstr "კონფიგურაცია"
+
+#: ../rpmdrake:339
+#, fuzzy, c-format
+msgid "Console Tools"
+msgstr "კონსოლი"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr ""
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr ""
+
+#: ../rpmdrake:342
+#, fuzzy, c-format
+msgid "Internet station"
+msgstr "მყისი შეტყობინებები"
+
+#: ../rpmdrake:343
+#, fuzzy, c-format
+msgid "Multimedia station"
+msgstr "მულტიმედია"
+
+#: ../rpmdrake:344
+#, fuzzy, c-format
+msgid "Network Computer (client)"
+msgstr "კომპიუტერული მეცნიერებები"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr ""
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr ""
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr ""
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr ""
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr ""
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr ""
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr ""
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr ""
+
+#: ../rpmdrake:358
+#, fuzzy, c-format
+msgid "Database"
+msgstr "მონაცემთა ბაზები"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr ""
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "კომპიუტერული მეცნიერებები"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr ""
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr ""
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr ""
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr ""
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "პროგრამათა მენეჯმენტი"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "სტოპ"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:560
-msgid "Not selected"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr ""
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr ""
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr ""
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr ""
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr ""
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr ""
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr ""
 
-#: ../rpmdrake:630
-#, fuzzy
+#: ../rpmdrake:719
+#, fuzzy, c-format
 msgid "Files:\n"
 msgstr "/_ფაილი"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "სახელი:"
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "ვერსია:"
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "ზომა:"
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "შეჯამება:"
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "აღწერა:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "პროგრამათა მენეჯმენტი"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "ერთერთი შემდეგი პაკეტი საჭიროა:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr ""
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr ""
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr ""
+#: ../rpmdrake:1053
+#, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] ""
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr ""
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr ""
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "ინსტალირება"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "ინსტალირება"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr ""
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr ""
 
-#: ../rpmdrake:1067
-msgid "Bugfixes updates"
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
 msgstr ""
 
-#: ../rpmdrake:1067
-msgid "Normal updates"
+#: ../rpmdrake:1181
+#, c-format
+msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1067
-msgid "Security updates"
+#: ../rpmdrake:1181
+#, c-format
+msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr ""
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr ""
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1289,131 +1676,171 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_ფაილი"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr ""
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr ""
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_დამთავრება"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_თვისებები"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr ""
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_დახმარება"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_ხარვეზის შეტყობინება"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_შესახებ..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, c-format
+msgid "Rpmdrake"
 msgstr ""
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr ""
 
-#: ../rpmdrake:1280
-#, fuzzy
+#: ../rpmdrake:1414
+#, fuzzy, c-format
 msgid "Search"
 msgstr "მოძებნა:"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "ამოშლა"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr ""
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "ცვლილებების გააქტიურება"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "გასვლა"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr ""
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "გთხოვთ იქონიოთ მოთმინება"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "მიმდინარეობს ინიციალიზაცია..."
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
 msgstr "კონფიგურაცია"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1421,12 +1848,13 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr ""
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1436,12 +1864,13 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1450,74 +1879,91 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, c-format
+msgid "Reading updates description"
+msgstr ""
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake:1604
+#, c-format
+msgid "Please wait, listing base packages..."
+msgstr ""
+
+#: ../rpmdrake:1640
+#, c-format
+msgid "Please wait, finding installed packages..."
 msgstr ""
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr ""
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake:1639
-#, fuzzy
+#: ../rpmdrake:1829
+#, fuzzy, c-format
 msgid "Installation finished"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr ""
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr ""
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1525,61 +1971,63 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgstr[0] "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "მიმდინარეობს ინიციალიზაცია..."
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "დაკავშირება"
 
-#: ../rpmdrake:1741
-#, fuzzy
-msgid "Package installation..."
-msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
+#: ../rpmdrake:1927
+#, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
 
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "გთხოვთ იქონიოთ მოთმინება"
+#: ../rpmdrake:1927
+#, c-format
+msgid "Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake:1751
-#, fuzzy, perl-format
+#: ../rpmdrake:1945
+#, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "გაფრთხილება"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1588,12 +2036,13 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1601,25 +2050,28 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr ""
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, fuzzy, perl-format
+#: ../rpmdrake:2031
+#, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1627,44 +2079,61 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, c-format
+msgid "Upgrade information about this package"
+msgstr ""
+
+#: ../rpmdrake:2086
+#, c-format
+msgid "Upgrade information about package %s"
 msgstr ""
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "შეცდომა"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr ""
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "იდღეგრძელეთ!"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1672,8 +2141,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1681,11 +2150,13 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1694,173 +2165,213 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Software Update"
 msgstr ""
 
-#: ../rpmdrake.pm:102
-msgid "Software Update"
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
 msgstr ""
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 
-#: ../rpmdrake.pm:130
-#, fuzzy
+#: ../rpmdrake.pm:132
+#, fuzzy, c-format
 msgid "User name:"
 msgstr "მომხმარებელი:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr ""
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr ""
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "არა"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "კი"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr ""
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr ""
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr ""
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr ""
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr ""
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr ""
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr ""
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr ""
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr ""
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr ""
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr ""
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr ""
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr ""
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1868,7 +2379,8 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1876,25 +2388,28 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -1904,7 +2419,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -1914,14 +2429,17 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr ""
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -1931,63 +2449,68 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr ""
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:661
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:656
+#, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "ნახვამდის! ვკეტავ სისტემას..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr ""
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -1997,29 +2520,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr ""
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr ""
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr ""
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2027,51 +2550,55 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2346,9 +2873,6 @@ 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 ed1ead56..4f09b148 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -15,19 +15,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -41,17 +44,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "일반 업데이트"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -66,88 +70,104 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "기다려 주세요. 매체 업데이트 중..."
 
-#: ../edit-urpm-sources.pl:134
-#, fuzzy
+#: ../edit-urpm-sources.pl:144
+#, fuzzy, c-format
 msgid "Add a medium"
 msgstr "소스 추가:"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "지역 파일"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "경로:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP 서버"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP 서버"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP 서버"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "경로 또는 마운트 위치:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "탈착식 장치"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "경로 또는 마운트 위치:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "찾아보기..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "아이디:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "암호:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "합성/목록 파일로의 상대 경로:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "이름:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "업데이트하려는 소스을 선택해 주세요:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "최소한 처음 두 항목에는 기입해야 합니다."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -155,116 +175,132 @@ msgstr ""
 "이미 동일한 이름의 매체가 있습니다.\n"
 "새로 바꾸시겠습니까?"
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy
+#: ../edit-urpm-sources.pl:252
+#, fuzzy, c-format
 msgid "Adding a medium:"
 msgstr "소스 추가:"
 
-#: ../edit-urpm-sources.pl:245
-#, fuzzy
+#: ../edit-urpm-sources.pl:254
+#, fuzzy, c-format
 msgid "Type of medium:"
 msgstr "소스 유형:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "취소"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "확인"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "설치할 팩키지 준비 중..."
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "항상"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "절대아님"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "[%s] 팩키지를 설치할 수 없습니다.\n"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:355
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "소프트웨어 팩키지 제거"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "기다려 주세요. 매체 제거 중..."
 
-#: ../edit-urpm-sources.pl:398
-#, fuzzy
+#: ../edit-urpm-sources.pl:405
+#, fuzzy, c-format
 msgid "Edit a medium"
 msgstr "소스 편집"
 
-#: ../edit-urpm-sources.pl:404
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:411
+#, fuzzy, c-format
 msgid "Editing medium \"%s\":"
 msgstr "소스 [%s] 편집:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "변경사항 저장"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
-#, fuzzy
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, fuzzy, c-format
 msgid "Proxy..."
 msgstr "오류..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "게속하려면 매체를 삽입해야 합니다."
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "변경사항을 저장하려면, 매체를 드라이브에 삽입해야 합니다."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "프락시 설정"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -272,209 +308,247 @@ msgstr ""
 "프락시가 필요하다면, 프락시 호스트명과 포트(옵션)를 입력하세요.(문법: <호스트"
 "명[:포트]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "프락시 호스트명:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "프락시 인증이 있다면 사용자명과 암호를 입력할 수 있습니다:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "사용자:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:565
-#, fuzzy
+#: ../edit-urpm-sources.pl:577
+#, fuzzy, c-format
 msgid "Add a medium limit"
 msgstr "소스 추가:"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:651
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:663
+#, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "소스 [%s] 편집:"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "그룹 이름"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "프로토콜:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "더하기"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "제거"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "그룹"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "명령"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(없음)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "편집"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "추가..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "보통"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:798
-#, fuzzy
+#: ../edit-urpm-sources.pl:816
+#, fuzzy, c-format
 msgid "Add a key"
 msgstr "추가..."
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:838
-#, fuzzy
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "닫기"
+
+#: ../edit-urpm-sources.pl:856
+#, fuzzy, c-format
 msgid "Remove a key"
 msgstr "소프트웨어 제거"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-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:857
-#, fuzzy
+#: ../edit-urpm-sources.pl:875
+#, fuzzy, c-format
 msgid "Add a key..."
 msgstr "추가..."
 
-#: ../edit-urpm-sources.pl:861
-#, fuzzy
+#: ../edit-urpm-sources.pl:879
+#, fuzzy, c-format
 msgid "Remove key"
 msgstr "제거"
 
-#: ../edit-urpm-sources.pl:877
-#, fuzzy
+#: ../edit-urpm-sources.pl:895
+#, fuzzy, c-format
 msgid "Configure media"
 msgstr "소스 설정"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "사용가?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "업데이트 버전"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "추가..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "업데이트..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "도움말"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -484,8 +558,8 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../edit-urpm-sources.pl:1033
-#, fuzzy
+#: ../edit-urpm-sources.pl:1054
+#, fuzzy, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -499,7 +573,8 @@ msgstr ""
 "설정된 소스는 새 소프트웨어 팩키지를 설치하거나 업데이트할 때\n"
 "사용됩니다."
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -507,653 +582,899 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "사용법: %s [옵션]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "내게 필요한 설정"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "파일 꾸리기"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "백업"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD 굽기"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "압축"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "기타"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
-#, fuzzy
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, fuzzy, c-format
 msgid "Books"
 msgstr "기타"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "통신"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "자료틀"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "개발"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "자바"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "커널"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "파이썬"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "편집기"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "교육"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "에뮬레이터"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "파일 도구"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "게임"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "모험"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "아케이드"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "보드"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "카드"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "퍼즐"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "스포츠"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "전략"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "인라이튼먼트"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "그놈"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "소피쉬"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "그림"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "모니터링"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "멀티미디어"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "비디오"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "네트워크"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "대화"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "파일 전송"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "인스턴스 메시지"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "메일"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "뉴스"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "원격 접속"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "월드와이드웹"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "사무용 도구"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "출판"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "과학"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "천문학"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "생물학"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "화학"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "전산학"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "지구과학"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "수학"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "물리학"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "명령 해석기"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "소리"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "시스템"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "베이스"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "설정"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "부팅과 초기화"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "하드웨어"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "팩키지 관리"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "인쇄"
 
-#: ../rpmdrake:300
-#, fuzzy
+#: ../rpmdrake:317
+#, fuzzy, c-format
 msgid "Deploiement"
 msgstr "개발"
 
-#: ../rpmdrake:301
-#, fuzzy
+#: ../rpmdrake:318
+#, fuzzy, c-format
 msgid "Deployment"
 msgstr "개발"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "폰트"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "콘솔"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "라이브러리"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "서버"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "터미널"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "텍스트 도구"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "장난감"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "워크스테이션"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "콘솔 도구"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "문서"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "게임 스테이션"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "인터넷 스테이션"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "멀티미디어 스테이션"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "네트웍 컴퓨터 (클라이언트)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "오피스 워크스테이션"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "과학 워크스테이션"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "그래픽 환경"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME 워크스테이션"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "일터"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE 워크스테이션"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "기타 그래픽 데스크탑"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "서버"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "데이터베이스"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "방화벽/라우터"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "네트웍 컴퓨터 서버"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "웹/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(유효하지 않음)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "검색 결과"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "검색 결과(없음)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "기다려 주세요. 검색 중..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "추가 가능"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "소프트웨어 소스 관리자"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "중지"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "업그레이드 가능"
 
-#: ../rpmdrake:560
-#, fuzzy
-msgid "Not selected"
-msgstr "충돌이 감지되었습니다."
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "추가 가능"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "선택됨"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "충돌이 감지되었습니다."
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "중요도: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "업데이트 이유:"
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "보안 업데이트"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "설명 없음"
 
-#: ../rpmdrake:609
-#, fuzzy
+#: ../rpmdrake:699
+#, fuzzy, c-format
 msgid "Files:"
 msgstr "%s파일들:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "변경사항:"
 
-#: ../rpmdrake:630
-#, fuzzy
+#: ../rpmdrake:719
+#, fuzzy, c-format
 msgid "Files:\n"
 msgstr "%s파일들:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "변경사항:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "설치된 버전:"
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "이름: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "버전: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "크기: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "요약 설명: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "설명:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "소프트웨어 소스 관리자"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "추가 팩키지 정보..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "다음 팩키지들 중 하나가 필요합니다:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "선택하세요"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "다음 팩키지들 중 하나가 필요합니다:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "기다려 주세요. 팩키지 목록 정렬 중..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "업데이트 없음"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1163,42 +1484,48 @@ msgstr ""
 "팩키지에 대한 업데이트가 없거나,\n"
 "이미 다 설치된 경우입니다."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "모두"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:857 ../rpmdrake:1882
-#, fuzzy
+#: ../rpmdrake:964
+#, fuzzy, c-format
 msgid "Information on packages"
 msgstr "추가 팩키지 정보..."
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "일부 팩키지가 더 제거 되어야 합니다."
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "의존성 문제로 인하여, 다음 팩키지들도 제거 되어야 합니다:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
-#, fuzzy
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "[%s] 팩키지를 설치할 수 없습니다.\n"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1208,11 +1535,13 @@ msgstr ""
 "지금 선택 해제되어야 합니다:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "추가 팩키지가 필요합니다."
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1222,138 +1551,158 @@ msgstr ""
 "설치되어야 합니다.\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr "[%s] 팩키지를 설치할 수 없습니다.\n"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "[%s] 팩키지를 설치할 수 없습니다.\n"
 
-#: ../rpmdrake:945
-#, fuzzy, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "다음 팩키지들은 선택될 수 없습니다:\n"
 "\n"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "일부 팩키지는 제거되어야 합니다."
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "선택된 용량: %s / 여유 공간: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "선택된 크기: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "설치"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "설치"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "맨드리바 선택"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "모든 팩키지, 가나다순"
 
-#: ../rpmdrake:1061
-#, fuzzy
+#: ../rpmdrake:1175
+#, fuzzy, c-format
 msgid "All packages, by update availability"
 msgstr "업데이트 가능성별"
 
-#: ../rpmdrake:1062
-#, fuzzy
+#: ../rpmdrake:1176
+#, fuzzy, c-format
 msgid "All packages, by size"
 msgstr "모든 팩키지"
 
-#: ../rpmdrake:1063
-#, fuzzy
+#: ../rpmdrake:1177
+#, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "선택 상태별"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1065
-#, fuzzy
+#: ../rpmdrake:1179
+#, fuzzy, c-format
 msgid "All packages, by group"
 msgstr "모든 팩키지"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "일반 업데이트"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "보안 업데이트"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "버그수정 업데이트"
 
-#: ../rpmdrake:1067
-msgid "Normal updates"
-msgstr "일반 업데이트"
-
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "보안 업데이트"
+#: ../rpmdrake:1181
+#, c-format
+msgid "Normal updates"
+msgstr "일반 업데이트"
 
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "이름별"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "설명별"
 
-#: ../rpmdrake:1127
-#, fuzzy
+#: ../rpmdrake:1248
+#, fuzzy, c-format
 msgid "in file names"
 msgstr "파일별"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
-#, fuzzy
+#: ../rpmdrake:1279
+#, fuzzy, c-format
 msgid "You need to select some packages first."
 msgstr "소스 팩키지를 가져올 수 없습니다."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "너무 많은 팩키지를 선택하였습니다."
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1370,135 +1719,171 @@ msgstr ""
 "\n"
 "정말로 선택된 모든 팩키지를 설치하시겠습니까?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/매체 업데이트(_U)"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/선택 재설정(_R)"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/팩키지 목록 다시 읽기(_P)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/종료(_Q)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/옵션(_O)"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "소프트웨어 소스 관리자"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
-#, fuzzy
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, fuzzy, c-format
 msgid "/_Show automatically selected packages"
 msgstr "자동으로 선택된 팩키지들 보이기"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/버그 보고(_R)"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/정보(_A)..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "맨드리바 온라인"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "찾기"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "검색"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "지우기"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "모두 선택"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "적용"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "종료"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
-#, fuzzy
+#: ../rpmdrake:1505
+#, fuzzy, c-format
 msgid "Fatal error"
 msgstr "파일 오류"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "기다려 주세요"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "팩키지 설치 중..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "초기화..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
-msgstr "LAN 설정"
+msgstr "확인"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1510,13 +1895,13 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../rpmdrake:1378
-#, fuzzy
+#: ../rpmdrake:1543
+#, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "업데이트 매체 추가 중 오류"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1526,12 +1911,13 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "수동으로 미러를 선택하는 방법"
 
-#: ../rpmdrake:1390
-#, fuzzy, perl-format
+#: ../rpmdrake:1556
+#, fuzzy, c-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"
@@ -1545,58 +1931,73 @@ msgstr ""
 "\n"
 "그런 후, 맨드리바 업데이트를 다시 실행하세요."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "설명별"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "기다려 주세요. 유효한 팩키지 검색 중..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "기다려 주세요. 팩키지 데이터베이스 읽는 중..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "기다려 주세요. 팩키지 목록 정렬 중..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "기다려 주세요. 유효한 팩키지 검색 중..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "%s 조사중"
 
-#: ../rpmdrake:1607
-#, fuzzy
+#: ../rpmdrake:1797
+#, fuzzy, c-format
 msgid "changes:"
 msgstr "변경사항 저장"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr ".%s 제거"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr ".%s을(를) 주 파일로 사용"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "그냥 둠"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "설치 완료"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "조사..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "요청된 모든 팩키지의 설치를 마쳤습니다."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
-#, fuzzy
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, fuzzy, c-format
 msgid "Problem during installation"
 msgstr "설치중에 문제가 발생했습니다."
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, fuzzy, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, fuzzy, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1606,17 +2007,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "소스 팩키지를 가져올 수 없습니다."
 
-#: ../rpmdrake:1710
-#, fuzzy, perl-format
+#: ../rpmdrake:1902
+#, fuzzy, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "팩키지 설치는 root 사용자만 할 수 있습니다."
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1624,68 +2026,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "의존성 문제로 인하여, 다음 팩키지들도\n"
 "설치되어야 합니다.\n"
 "\n"
 
-#: ../rpmdrake:1730
-#, fuzzy, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "소프트웨어 제거"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"다른 팩키지를 업그레이드하기 위해, 다음 팩키지들은 제거되어야 합니다:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"계속할까요?"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
 msgstr ""
-"다른 팩키지를 업그레이드하기 위해, 다음 팩키지들은 제거되어야 합니다:\n"
-"\n"
 "%s\n"
 "\n"
 "계속할까요?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "초기화..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "팩키지 설치 중..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "기다려 주세요"
-
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "매체 교환"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "팩키지 내려받는 중: [%s] (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "경고"
 
-#: ../rpmdrake:1794
-#, fuzzy, perl-format
+#: ../rpmdrake:1986
+#, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1699,12 +2107,13 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "설치 실패"
 
-#: ../rpmdrake:1804
-#, fuzzy, perl-format
+#: ../rpmdrake:1999
+#, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1714,28 +2123,28 @@ msgstr ""
 "설치 실패. 일부 파일이 없습니다.\n"
 "소스 데이터베이스를 업데이트해 보세요."
 
-#: ../rpmdrake:1819
-#, fuzzy
+#: ../rpmdrake:2013
+#, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "설치할 팩키지 준비 중..."
 
-#: ../rpmdrake:1819
-#, fuzzy
+#: ../rpmdrake:2013
+#, fuzzy, c-format
 msgid "Preparing..."
 msgstr "부트 로더 준비중"
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "팩키지 설치 중: [%s] (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1747,34 +2156,48 @@ msgstr ""
 "일부 설정 파일들은 '.rpmnew' 또는 '.rpmsave'로 생성되었습니다.\n"
 "조치를 취하기 위해 일부를 조사해 볼 수 있습니다:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "일반 정보"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "추가 팩키지 정보..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "추가 팩키지 정보..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "오류"
 
-#: ../rpmdrake:1910
-#, fuzzy
+#: ../rpmdrake:2099
+#, fuzzy, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "설치할 팩키지 준비 중..."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "기다려 주세요. 팩키지 제거 중..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake:1947
-#, fuzzy, perl-format
+#: ../rpmdrake:2136
+#, fuzzy, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1784,11 +2207,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "어서 오세요."
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1800,8 +2225,8 @@ msgstr ""
 "이 도구는 컴퓨터에서 제거할 소프트웨어를 선택할 수 있도록\n"
 "도와 줍니다."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1813,11 +2238,13 @@ msgstr ""
 "이 도구는 컴퓨터에 설치할 업데이트된 소프트웨어를 선택할 수 있도록\n"
 "도와 줍니다."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1832,177 +2259,213 @@ msgstr ""
 "록\n"
 "도와 줍니다."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "맨드리바 업데이트"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "소프트웨어 팩키지 제거"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "맨드리바 업데이트"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "아래에 이메일 주소를 입력하세요."
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "사용자 이름:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "소프트웨어 팩키지 제거"
 
-#: ../rpmdrake.pm:174
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "소프트웨어 팩키지 제거"
 
-#: ../rpmdrake.pm:175
-#, fuzzy
+#: ../rpmdrake.pm:177
+#, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "설치할 팩키지 준비 중..."
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "아니오"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "예"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "정보..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "오스트리아"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "오스트레일리아"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "벨기에"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "브라질"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "캐나다"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "스위스"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "코스타리카"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "체코 공화국"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "독일"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "덴마크"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "그리스"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "스페인"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "핀란드"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "프랑스"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "헝가리"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "이스라엘"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "이태리"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "일본"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "대한민국"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "네덜란드"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "노르웨이"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "폴란드"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "포르투갈"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "러시아"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "스웨덴"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "싱가포르"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "슬로바키아"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "대만"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "영국"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "중국"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "미국"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2014,7 +2477,8 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2026,28 +2490,30 @@ msgstr ""
 "\n"
 "계속할까요?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "기다려 주세요. 맨드리바소프트 웹사이트에서 미러 목록을 내려받고 있습니다."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "기다려 주세요. 맨드리바소프트 웹사이트에서 미러 목록을 내려받고 있습니다."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "내려받기 중 오류"
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2062,7 +2528,7 @@ msgstr ""
 "나중에 다시 시도해 보세요."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2077,14 +2543,17 @@ msgstr ""
 "나중에 다시 시도해 보세요."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "미러 없음"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2099,64 +2568,68 @@ msgstr ""
 "지원하지 않는 경우입니다."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "희망하는 미러를 선택하세요."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:653
-#, fuzzy
+#: ../rpmdrake.pm:648
+#, fuzzy, c-format
 msgid " failed!"
 msgstr "파일별"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:661
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:656
+#, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "[%s]의 서명 검증 중 ..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "기다려 주세요. 매체 업데이트 중..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2166,31 +2639,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
-#, fuzzy
+#: ../rpmdrake.pm:734
+#, fuzzy, c-format
 msgid "Update media"
 msgstr "소스 업데이트"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
-#, fuzzy
+#: ../rpmdrake.pm:746
+#, fuzzy, c-format
 msgid "Select the media you wish to update:"
 msgstr "업데이트하려는 소스을 선택해 주세요:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "모두 선택"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "업데이트 버전"
 
-#: ../rpmdrake.pm:789
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:785
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2198,25 +2669,26 @@ msgid ""
 "%s"
 msgstr "매체를 업데이트할 수 없습니다; 자동으로 사용불가될 것입니다."
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "매체를 생성할 수 없습니다."
 
-#: ../rpmdrake.pm:840
-#, fuzzy
+#: ../rpmdrake.pm:836
+#, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "기다려 주세요. 매체 추가 중..."
 
-#: ../rpmdrake.pm:841
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:837
+#, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2226,27 +2698,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2524,20 +2998,17 @@ msgstr "소프트웨어 제거"
 msgid "Software Media Manager"
 msgstr "소프트웨어 소스 관리자"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "기다려 주세요. 팩키지 데이터베이스 읽는 중..."
+
 #, fuzzy
 #~ msgid "No package found for installation."
 #~ msgstr "설치할 팩키지 준비 중..."
 
-#~ msgid "Stop"
-#~ msgstr "중지"
-
 #, fuzzy
 #~ msgid "All packages, by medium repository"
 #~ msgstr "소스 등록별"
 
-#~ msgid "Normal information"
-#~ msgstr "일반 정보"
-
 #~ msgid "Maximum information"
 #~ msgstr "최대 정보"
 
diff --git a/po/lt.po b/po/lt.po
index ca5fff47..0184661d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -12,19 +12,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 09:56+0100\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -39,16 +42,17 @@ msgid ""
 msgstr ""
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:94
-#, fuzzy
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "Saugumo atnaujinimai"
 
 #: ../edit-urpm-sources.pl:97
-#, perl-format
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -59,439 +63,497 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#. because updates media do not provide media.cfg yet
 #: ../edit-urpm-sources.pl:111
-#, fuzzy
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
 #: ../edit-urpm-sources.pl:144
-#, fuzzy
+#, fuzzy, c-format
 msgid "Add a medium"
 msgstr "Redaguoti Laikmena"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Vietinės bylos"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Kelias:"
 
 #: ../edit-urpm-sources.pl:147
-#, fuzzy
+#, fuzzy, c-format
 msgid "FTP server"
 msgstr "NIS serveris"
 
 #: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:416
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
 #: ../edit-urpm-sources.pl:148
-#, fuzzy
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "NIS serveris"
 
 #: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:150
-#, fuzzy
-msgid "Path or mount point:"
-msgstr "prijungimo vieta:"
-
-#: ../edit-urpm-sources.pl:150
-#, fuzzy
+#, fuzzy, c-format
 msgid "Removable device"
 msgstr "Išmesti laikmeną"
 
+#: ../edit-urpm-sources.pl:150
+#, fuzzy, c-format
+msgid "Path or mount point:"
+msgstr "prijungimo vieta:"
+
 #: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Naršyti..."
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:197 ../edit-urpm-sources.pl:501 ../rpmdrake.pm:131
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../edit-urpm-sources.pl:202 ../edit-urpm-sources.pl:417
-#, fuzzy
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, fuzzy, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "reliatyvus kelias iki hdlist:"
 
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:209
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: ../edit-urpm-sources.pl:217
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:238
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:242
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:253
-#, fuzzy
+#: ../edit-urpm-sources.pl:252
+#, fuzzy, c-format
 msgid "Adding a medium:"
 msgstr "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:255
-#, fuzzy
+#: ../edit-urpm-sources.pl:254
+#, fuzzy, c-format
 msgid "Type of medium:"
 msgstr "Laikmenos tipas:"
 
-#: ../edit-urpm-sources.pl:263 ../edit-urpm-sources.pl:338
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:453
-#: ../edit-urpm-sources.pl:518 ../edit-urpm-sources.pl:600
-#: ../edit-urpm-sources.pl:640 ../edit-urpm-sources.pl:698
-#: ../edit-urpm-sources.pl:837 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:1921 ../rpmdrake:1929 ../rpmdrake.pm:287 ../rpmdrake.pm:596
-#: ../rpmdrake.pm:681 ../rpmdrake.pm:754
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: ../edit-urpm-sources.pl:265 ../edit-urpm-sources.pl:340
-#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:508
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:639
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:763
-#: ../edit-urpm-sources.pl:830 ../edit-urpm-sources.pl:883
-#: ../edit-urpm-sources.pl:1032 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:977 ../rpmdrake:982 ../rpmdrake:1827 ../rpmdrake:1921
-#: ../rpmdrake:2068 ../rpmdrake.pm:122 ../rpmdrake.pm:227 ../rpmdrake.pm:289
-#: ../rpmdrake.pm:596
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Gerai"
 
-#: ../edit-urpm-sources.pl:322
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:334
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Paketas `%s' negali būti įdiegtas\n"
 
-#: ../edit-urpm-sources.pl:335
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:365
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "Šaltinis: "
 
-#: ../edit-urpm-sources.pl:366
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:371
-#, fuzzy
+#: ../edit-urpm-sources.pl:370
+#, fuzzy, c-format
 msgid "Please wait, removing medium..."
 msgstr ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../edit-urpm-sources.pl:407
-#, fuzzy
+#: ../edit-urpm-sources.pl:405
+#, fuzzy, c-format
 msgid "Edit a medium"
 msgstr "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:413
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:411
+#, fuzzy, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
 msgid "Downloader:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:430
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Išsaugoti pakeitimus"
 
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:1019
-#, fuzzy
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, fuzzy, c-format
 msgid "Proxy..."
 msgstr "Klaida..."
 
-#: ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:452
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
-#, fuzzy
+#: ../edit-urpm-sources.pl:471
+#, fuzzy, c-format
 msgid "Configure proxies"
 msgstr ""
 "Atnaujinti\n"
 "laikmeną"
 
-#: ../edit-urpm-sources.pl:484
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:485
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:487
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:490
-#, fuzzy
+#: ../edit-urpm-sources.pl:488
+#, fuzzy, c-format
 msgid "Proxy hostname:"
 msgstr "Tarpinės stoties (proxy) vartotojo vardas:"
 
-#: ../edit-urpm-sources.pl:493
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:496
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Vartotojas:"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:579
-#, fuzzy
+#: ../edit-urpm-sources.pl:577
+#, fuzzy, c-format
 msgid "Add a medium limit"
 msgstr "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:591
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:628
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:665
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:663
+#, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:669
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Grupės pavadinimas:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokolas:"
 
-#: ../edit-urpm-sources.pl:672
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Pridėti"
 
-#: ../edit-urpm-sources.pl:678 ../edit-urpm-sources.pl:685
-#: ../edit-urpm-sources.pl:743 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Pašalinti"
 
-#: ../edit-urpm-sources.pl:679
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:713
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grupe"
 
-#: ../edit-urpm-sources.pl:716
-msgid "Media limit"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokolas"
 
-#: ../edit-urpm-sources.pl:717
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Komanda"
 
-#: ../edit-urpm-sources.pl:727 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:886 ../rpmdrake:1748
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(jokio)"
 
-#: ../edit-urpm-sources.pl:747 ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Redaguoti..."
 
-#: ../edit-urpm-sources.pl:755 ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Įdėti..."
 
-#: ../edit-urpm-sources.pl:771
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:775 ../edit-urpm-sources.pl:932
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Vidutinis"
 
 #: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:799
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:812
-#, fuzzy
+#: ../edit-urpm-sources.pl:816
+#, fuzzy, c-format
 msgid "Add a key"
 msgstr "Redaguoti Laikmena"
 
-#: ../edit-urpm-sources.pl:824
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:833
+#: ../edit-urpm-sources.pl:834
+#, c-format
 msgid "Close"
 msgstr "Uždaryti"
 
-#: ../edit-urpm-sources.pl:855
-#, fuzzy
+#: ../edit-urpm-sources.pl:856
+#, fuzzy, c-format
 msgid "Remove a key"
 msgstr "Nutolęs spausdintuvas"
 
-#: ../edit-urpm-sources.pl:853
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-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:871
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:875
-#, fuzzy
+#: ../edit-urpm-sources.pl:879
+#, fuzzy, c-format
 msgid "Remove key"
 msgstr "Nutolęs spausdintuvas"
 
-#: ../edit-urpm-sources.pl:891
-#, fuzzy
+#: ../edit-urpm-sources.pl:895
+#, fuzzy, c-format
 msgid "Configure media"
 msgstr ""
 "Atnaujinti\n"
 "laikmeną"
 
-#: ../edit-urpm-sources.pl:930
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:931
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Atnaujinti"
 
-#: ../edit-urpm-sources.pl:947
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:977
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1011
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1015
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1018
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1020
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1021
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1031 ../rpmdrake:1428
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Pagalba"
 
-#: ../edit-urpm-sources.pl:1047 ../gurpmi.addmedia:98 ../rpmdrake:2144
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1050
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -500,7 +562,8 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1063
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -509,11 +572,12 @@ msgid ""
 msgstr ""
 
 #: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
 #: ../gurpmi.addmedia:102
-#, perl-format
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -521,7 +585,7 @@ msgid ""
 msgstr ""
 
 #: ../gurpmi.addmedia:105
-#, perl-format
+#, c-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"
@@ -529,79 +593,93 @@ msgid ""
 msgstr ""
 
 #: ../gurpmi.addmedia:130
-#, perl-format
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
 #: ../gurpmi.addmedia:131
-#, perl-format
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
 #: ../rpmdrake:39
-#, perl-format
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Vartojimas: %s [PARINKTIS]..."
 
 #: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
 #: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
 #: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
 #: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
 #: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
 #: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
 #: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
 #: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
 #: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
 #: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
 #: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
 #: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
 #: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr ""
 
 #: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -609,71 +687,86 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Prieinamumas"
 
 #: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
 #: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Archyvavimas"
 
 #: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Atsarginės kopijos"
 
 #: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD kepimas"
 
 #: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Suspaudimas"
 
 #: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
 #: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
 #: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Kitas"
 
 #: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
 #: ../rpmdrake:224 ../rpmdrake:225
-#, fuzzy
+#, fuzzy, c-format
 msgid "Books"
 msgstr "Kitas"
 
 #: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr ""
 
 #: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr ""
 
 #: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr ""
 
 #: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
 #: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
 #: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
 #: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Ryšiai"
 
 #: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Duombazės"
 
@@ -681,246 +774,302 @@ msgstr "Duombazės"
 #: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
 #: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Programavimas"
 
 #: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
 #: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
 #: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
 #: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
 #: ../rpmdrake:237
-#, fuzzy
+#, fuzzy, c-format
 msgid "KDE and Qt"
 msgstr "Kūrimo atnaujinimai"
 
 #: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Branduolys"
 
 #: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
 #: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
 #: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
 #: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Redaktoriai"
 
 #: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Mokslas"
 
 #: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emuliatoriai"
 
 #: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Bylų įrankiai"
 
 #: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
 #: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
 #: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Žaidimai"
 
 #: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Nuotykiai"
 
 #: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkada"
 
 #: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Lentos"
 
 #: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kortos"
 
 #: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Dėlionės"
 
 #: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sportas"
 
 #: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategija"
 
 #: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
 #: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
 #: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
 #: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
 #: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Stebėjimas"
 
 #: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedija"
 
 #: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Vaizdas"
 
 #: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
 #: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
 #: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Tinklai"
 
 #: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Pokalbiai"
 
 #: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Bylų siuntimas"
 
 #: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
 #: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Greitų pranešimų siuntimas"
 
 #: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Paštas"
 
 #: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Naujienos"
 
 #: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Nuotolinis priėjimas"
 
 #: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
 #: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Biuro programos"
 
 #: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
 #: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Spausdinimas"
 
 #: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
 #: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
 #: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Mokslai"
 
 #: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomija"
 
 #: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologija"
 
 #: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Chemija"
 
 #: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Informatika"
 
 #: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Gamtos mokslai"
 
 #: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
 #: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizika"
 
 #: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "SHell'ai"
 
 #: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Garsas"
 
@@ -930,537 +1079,615 @@ msgstr "Garsas"
 #: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
 #: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
 #: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistema"
 
 #: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Pagrindas"
 
 #: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
 #: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Konfigūracija"
 
 #: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Įkrova ir paleidimas"
 
 #: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Geležis"
 
 #: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Paketai"
 
 #: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Spausdinu"
 
 #: ../rpmdrake:317
-#, fuzzy
+#, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Kūrimo atnaujinimai"
 
 #: ../rpmdrake:318
-#, fuzzy
+#, fuzzy, c-format
 msgid "Deployment"
 msgstr "Kūrimo atnaujinimai"
 
 #: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
 #: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Šriftai"
 
 #: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsolė"
 
 #: ../rpmdrake:321
-#, fuzzy
+#, fuzzy, c-format
 msgid "True type"
 msgstr "Tipas"
 
 #: ../rpmdrake:322
-#, fuzzy
+#, fuzzy, c-format
 msgid "Type1"
 msgstr "Tipas"
 
 #: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr ""
 
 #: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr ""
 
 #: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
 #: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr ""
 
 #: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Serveriai"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
 #: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminalai"
 
 #: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Teksto įrankiai"
 
 #: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Žaislai"
 
-#. for Mandriva Choice:
 #: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
 #: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
 #: ../rpmdrake:345 ../rpmdrake:346
-#, fuzzy
+#, fuzzy, c-format
 msgid "Workstation"
-msgstr "LAN Konfiguravimas"
+msgstr "KDE darbo stotis"
 
 #: ../rpmdrake:339
-#, fuzzy
+#, c-format
 msgid "Console Tools"
-msgstr "Konsolė"
+msgstr "Konsolės įrankiai"
 
 #: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentacija"
 
 #: ../rpmdrake:341
+#, c-format
 msgid "Game station"
-msgstr ""
+msgstr "Žaidimų stotis"
 
 #: ../rpmdrake:342
-#, fuzzy
+#, c-format
 msgid "Internet station"
-msgstr "Greitų pranešimų siuntimas"
+msgstr "Interneto stotis"
 
 #: ../rpmdrake:343
-#, fuzzy
+#, c-format
 msgid "Multimedia station"
-msgstr "Multimedija"
+msgstr "Multimedija stotis"
 
 #: ../rpmdrake:344
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Computer (client)"
-msgstr "Informatika"
+msgstr "Tinklo Kompiuteris, X klientas"
 
 #: ../rpmdrake:345
+#, c-format
 msgid "Office Workstation"
-msgstr ""
+msgstr "Biuro darbo stotis"
 
 #: ../rpmdrake:346
+#, c-format
 msgid "Scientific Workstation"
 msgstr "Mokslinės darbo stotis"
 
 #: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
 #: ../rpmdrake:352
+#, c-format
 msgid "Graphical Environment"
 msgstr ""
 
 #: ../rpmdrake:349
+#, c-format
 msgid "GNOME Workstation"
-msgstr ""
+msgstr "Gnome darbo stotis"
 
 #: ../rpmdrake:350
+#, fuzzy, c-format
 msgid "IceWm Desktop"
-msgstr ""
+msgstr "Darbastalis"
 
 #: ../rpmdrake:351
+#, c-format
 msgid "KDE Workstation"
-msgstr ""
+msgstr "KDE darbo stotis"
 
 #: ../rpmdrake:352
+#, c-format
 msgid "Other Graphical Desktops"
-msgstr ""
+msgstr "Kiti grafiniai darbalaukiai"
 
 #: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
 #: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
 msgid "Server"
 msgstr "Serveris"
 
 #: ../rpmdrake:357
+#, c-format
 msgid "DNS/NIS"
-msgstr ""
+msgstr "DNS/NIS"
 
 #: ../rpmdrake:358
-#, fuzzy
+#, c-format
 msgid "Database"
-msgstr "Duombazės"
+msgstr "Serveris, Duomenų bazių"
 
 #: ../rpmdrake:359
+#, c-format
 msgid "Firewall/Router"
-msgstr ""
+msgstr "Serveris, Firewall/Routeris"
 
 #: ../rpmdrake:361
+#, c-format
 msgid "Mail/Groupware/News"
 msgstr ""
 
 #: ../rpmdrake:362
-#, fuzzy
+#, fuzzy, c-format
 msgid "Network Computer server"
-msgstr "Informatika"
+msgstr "Serveris, Tinklo Kompiuterio serveris"
 
 #: ../rpmdrake:363
+#, c-format
 msgid "Web/FTP"
-msgstr ""
+msgstr "Serveris, Tinklapių/FTP"
 
-#. - to highlight information
-#: ../rpmdrake:502 ../rpmdrake:707 ../rpmdrake:712 ../rpmdrake:726
-#: ../rpmdrake:728
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:534
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Paieškos rezultatai"
 
 #: ../rpmdrake:534
-#, fuzzy
+#, fuzzy, c-format
 msgid "Search results (none)"
 msgstr "Paieškos rezultatai"
 
-#: ../rpmdrake:545 ../rpmdrake:2125
-#, fuzzy
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, fuzzy, c-format
 msgid "Please wait, searching..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:617 ../rpmdrake:921
-#, fuzzy
-msgid "Addable"
-msgstr "Galimi"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Programinės įrangos įdiegimas"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Stop"
 
-#: ../rpmdrake:617 ../rpmdrake:921
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:619
-#, fuzzy
-msgid "Not selected"
-msgstr "Rasti konfliktai"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, fuzzy, c-format
+msgid "Addable"
+msgstr "Galimi"
 
 #: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Pažymėtas"
 
-#. is it an update?
-#: ../rpmdrake:687 ../rpmdrake:744
-#, fuzzy
+#: ../rpmdrake:619
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "Rasti konfliktai"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, fuzzy, c-format
 msgid "Importance: "
 msgstr "Svarba: %s\n"
 
-#: ../rpmdrake:688 ../rpmdrake:752
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:692
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:700 ../rpmdrake:754
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Nėra aprašymo"
 
-#: ../rpmdrake:703
-#, fuzzy
+#: ../rpmdrake:699
+#, fuzzy, c-format
 msgid "Files:"
 msgstr "/_Byla"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr ""
 
-#: ../rpmdrake:723
-#, fuzzy
+#: ../rpmdrake:719
+#, fuzzy, c-format
 msgid "Files:\n"
 msgstr "/_Byla"
 
-#: ../rpmdrake:728
-#, fuzzy
+#: ../rpmdrake:724
+#, fuzzy, c-format
 msgid "Changelog:\n"
 msgstr "Paketai"
 
-#: ../rpmdrake:733 ../rpmdrake.pm:807
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:734
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:738
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Pavadinimas: "
 
-#: ../rpmdrake:739
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versija: "
 
-#: ../rpmdrake:740
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:741
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:741
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Dydis: "
 
-#. extra empty line
-#: ../rpmdrake:748
-#, fuzzy
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, fuzzy, c-format
 msgid "Summary: "
 msgstr "Apibendrinimas"
 
-#: ../rpmdrake:754
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Aprašas: "
 
-#: ../rpmdrake:810 ../rpmdrake.pm:179
-#, fuzzy
-msgid "Software Management"
-msgstr "Programinės įrangos įdiegimas"
-
-#: ../rpmdrake:827 ../rpmdrake:973 ../rpmdrake:975
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:829
-msgid "One of the following packages is needed:"
-msgstr "Vienas iš šių paketų yra reikalingas."
-
-#: ../rpmdrake:829
-#, fuzzy
+#: ../rpmdrake:825
+#, fuzzy, c-format
 msgid "Please choose"
 msgstr "Prašom patvirtinti"
 
-#: ../rpmdrake:870
-#, fuzzy
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Vienas iš šių paketų yra reikalingas."
+msgstr[1] "Vienas iš šių paketų yra reikalingas."
+msgstr[2] "Vienas iš šių paketų yra reikalingas."
+
+#: ../rpmdrake:866
+#, fuzzy, c-format
 msgid "Please wait, listing packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:888
-#, fuzzy
+#: ../rpmdrake:884
+#, fuzzy, c-format
 msgid "No update"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:885
+#, c-format
 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:912 ../rpmdrake:1174
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Visos"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:960 ../rpmdrake:965
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:968
-#, fuzzy
+#: ../rpmdrake:964
+#, fuzzy, c-format
 msgid "Information on packages"
 msgstr "Negaliu atidaryti paketo"
 
-#: ../rpmdrake:991
-#, fuzzy
+#: ../rpmdrake:987
+#, fuzzy, c-format
 msgid "Some additional packages need to be removed"
 msgstr ""
 "Šis papildomas paketas turi būti įdiegtas kad viskas dirbtų gerai gerai:"
 
-#: ../rpmdrake:992
-#, fuzzy
+#: ../rpmdrake:988
+#, fuzzy, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Kad būtų patenkintos visos priklausomybės, šie paketai bus pašalinti:"
 
-#: ../rpmdrake:998 ../rpmdrake:1007
-#, fuzzy
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "Paketas `%s' negali būti įdiegtas\n"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:1008 ../rpmdrake:1073
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:1038
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:1053
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:1056
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr "Paketas `%s' negali būti įdiegtas\n"
-
-#: ../rpmdrake:1057
-#, fuzzy, perl-format
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Paketas `%s' negali būti įdiegtas\n"
+msgstr[1] "Paketas `%s' negali būti įdiegtas\n"
+msgstr[2] "Paketas `%s' negali būti įdiegtas\n"
+
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr "Paketas `%s' negali būti įdiegtas\n"
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] "Paketas `%s' negali būti įdiegtas\n"
+msgstr[1] "Paketas `%s' negali būti įdiegtas\n"
+msgstr[2] "Paketas `%s' negali būti įdiegtas\n"
 
-#: ../rpmdrake:1072 ../rpmdrake:1896
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:1101
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr ""
 
-#: ../rpmdrake:1102
-#, fuzzy, perl-format
+#: ../rpmdrake:1099
+#, fuzzy, c-format
 msgid "Selected size: %d MB"
 msgstr "%d pažymėti paketai: %.1f MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:1107
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1113 ../rpmdrake:1506
-#, perl-format
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../rpmdrake:1174
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Įdiegtas"
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Neįdiegti"
 
-#: ../rpmdrake:1175
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr ""
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1177
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:1178
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:1179
-#, fuzzy
+#: ../rpmdrake:1176
+#, fuzzy, c-format
 msgid "All packages, by size"
 msgstr "0 paketų, 0 baitų"
 
-#: ../rpmdrake:1180
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1182
-#, fuzzy
+#: ../rpmdrake:1179
+#, fuzzy, c-format
 msgid "All packages, by group"
 msgstr "0 paketų, 0 baitų"
 
-#: ../rpmdrake:1184
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:1184
-#, fuzzy
-msgid "Bugfixes updates"
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:1184
-#, fuzzy
-msgid "Normal updates"
+#: ../rpmdrake:1181
+#, fuzzy, c-format
+msgid "Bugfixes updates"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:1184
-msgid "Security updates"
+#: ../rpmdrake:1181
+#, fuzzy, c-format
+msgid "Normal updates"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:1247
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1249
-#, fuzzy
+#: ../rpmdrake:1246
+#, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Aprašymai"
 
-#: ../rpmdrake:1251
-#, fuzzy
+#: ../rpmdrake:1248
+#, fuzzy, c-format
 msgid "in file names"
 msgstr "%d bylos"
 
-#: ../rpmdrake:1278
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Klaida: %s prijungta tik skaitymui."
 
-#: ../rpmdrake:1282
-#, fuzzy
+#: ../rpmdrake:1279
+#, fuzzy, c-format
 msgid "You need to select some packages first."
 msgstr "Atsiprašome, bet jums reikia perkrauti sistema kad įdiegti."
 
-#: ../rpmdrake:1287
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1285
+#, 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"
@@ -1470,147 +1697,171 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../rpmdrake:1320 ../rpmdrake:1323 ../rpmdrake:1334 ../rpmdrake:1347
-#: ../rpmdrake:1356
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Byla"
 
-#: ../rpmdrake:1323
-#, fuzzy
+#: ../rpmdrake:1320
+#, fuzzy, c-format
 msgid "/_Update media"
 msgstr "Atnaujinti laikmeną"
 
-#: ../rpmdrake:1334
-#, fuzzy
+#: ../rpmdrake:1331
+#, fuzzy, c-format
 msgid "/_Reset the selection"
 msgstr "/Rikiuoti parinkimą"
 
-#: ../rpmdrake:1347
-#, fuzzy
+#: ../rpmdrake:1344
+#, fuzzy, c-format
 msgid "/Reload the _packages list"
 msgstr "Paketas %s nėra pasirašytas"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/I_šeiti"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1359 ../rpmdrake:1360 ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Pasirinktys"
 
-#: ../rpmdrake:1360
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Programinės įrangos įdiegimas"
 
-#: ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1367 ../rpmdrake:1368 ../rpmdrake:1369 ../rpmdrake:1370
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Raportuoti Klaidą"
 
-#: ../rpmdrake:1370
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Apie..."
 
-#. nicer formatting
-#: ../rpmdrake:1373
-#, fuzzy
+#: ../rpmdrake:1370
+#, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:1375
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1377
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1379
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1384
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1408
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Surasti:"
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Ieškoti"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Išvalyti"
 
-#: ../rpmdrake:1433 ../rpmdrake.pm:758
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
 msgid "Select all"
 msgstr "Pažymėti viską"
 
-#: ../rpmdrake:1440
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Pritaikyti"
 
-#: ../rpmdrake:1444
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1461
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1462
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1463
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
 #: ../rpmdrake:1505
-#, fuzzy
+#, fuzzy, c-format
 msgid "Fatal error"
 msgstr "Rašymo klaida"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
-msgid "Initializing..."
-msgstr "Ruošiama įdiegimui..."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Prašom palaukti"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
 msgid "Package installation..."
 msgstr "Paketų įdiegimas..."
 
-#: ../rpmdrake:1507 ../rpmdrake:1932 ../rpmdrake.pm:311
-msgid "Please wait"
-msgstr "Prašom palaukti"
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Ruošiama įdiegimui..."
 
-#: ../rpmdrake:1530 ../rpmdrake:1918
-#, fuzzy
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "LAN Konfiguravimas"
+msgstr "Nustatymai"
 
-#: ../rpmdrake:1532
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1618,15 +1869,15 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1541
-#, fuzzy
+#: ../rpmdrake:1543
+#, fuzzy, c-format
 msgid "Already existing update media"
 msgstr ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../rpmdrake:1542
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1636,12 +1887,13 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1554
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1650,71 +1902,73 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1567
-#, fuzzy
+#: ../rpmdrake:1570
+#, fuzzy, c-format
 msgid "Reading updates description"
 msgstr "Aprašymai"
 
-#: ../rpmdrake:1593 ../rpmdrake:1670
-#, fuzzy
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, fuzzy, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:1601
-#, fuzzy
+#: ../rpmdrake:1604
+#, fuzzy, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:1637
-#, fuzzy
+#: ../rpmdrake:1640
+#, fuzzy, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:1771
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1772
-#, fuzzy
+#: ../rpmdrake:1797
+#, fuzzy, c-format
 msgid "changes:"
 msgstr "Paketai"
 
-#: ../rpmdrake:1780
-#, fuzzy, perl-format
+#: ../rpmdrake:1805
+#, fuzzy, c-format
 msgid "Remove .%s"
 msgstr "Išimama"
 
-#: ../rpmdrake:1784
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1788
-#, fuzzy
+#: ../rpmdrake:1813
+#, fuzzy, c-format
 msgid "Do nothing"
 msgstr "Kompiuteris: "
 
-#: ../rpmdrake:1804
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Įdiegimas baigtas"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr ""
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1852 ../rpmdrake:2045
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1856 ../rpmdrake:2025
-#, fuzzy
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, fuzzy, c-format
 msgid "Problem during installation"
 msgstr "Įdiegimo metu įvyko klaida"
 
-#: ../rpmdrake:1857 ../rpmdrake:2026 ../rpmdrake:2084
-#, fuzzy, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, fuzzy, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1724,17 +1978,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1876
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake:1877
-#, fuzzy, perl-format
+#: ../rpmdrake:1902
+#, fuzzy, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Atsiprašome, bet jums reikia perkrauti sistema kad įdiegti."
 
-#: ../rpmdrake:1878 ../rpmdrake:1976
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1742,60 +1997,90 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1894
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Priklausomybių patenkinimui, šie paketai %d turi būti įdiegti:\n"
+"%s\n"
+msgstr[1] ""
+"Priklausomybių patenkinimui, šie paketai %d turi būti įdiegti:\n"
+"%s\n"
+msgstr[2] ""
 "Priklausomybių patenkinimui, šie paketai %d turi būti įdiegti:\n"
 "%s\n"
 
-#: ../rpmdrake:1898
-#, fuzzy, perl-format
-msgid "Remove %d packages?"
-msgstr "Nutolęs spausdintuvas"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Nutolęs spausdintuvas"
+msgstr[1] "Nutolęs spausdintuvas"
+msgstr[2] "Nutolęs spausdintuvas"
 
-#: ../rpmdrake:1899
-#, fuzzy, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Sekanti byla yra netinkama:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Ar vistiek norite tęsti (praleidžiant šį paketą)?"
+msgstr[1] ""
+"Sekanti byla yra netinkama:\n"
+"\n"
+"%s\n"
+"\n"
+"Ar vistiek norite tęsti (praleidžiant šį paketą)?"
+msgstr[2] ""
 "Sekanti byla yra netinkama:\n"
 "\n"
 "%s\n"
 "\n"
 "Ar vistiek norite tęsti (praleidžiant šį paketą)?"
 
-#: ../rpmdrake:1941
+#: ../rpmdrake:1927
+#, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Prašome įkišti laikmeną pavadintą \"%s\", į įrenginį [%s]"
 
-#: ../rpmdrake:1927
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Siunčiami paketai `%s' (%s/%s)..."
 
-#: ../rpmdrake:1947
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1960 ../rpmdrake.pm:737 ../rpmdrake.pm:846
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Dėmesio"
 
-#: ../rpmdrake:1961
-#, fuzzy, perl-format
+#: ../rpmdrake:1986
+#, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1809,12 +2094,13 @@ msgstr ""
 "\n"
 "Ar vistiek norite tęsti (praleidžiant šį paketą)?"
 
-#: ../rpmdrake:1973 ../rpmdrake:2083
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Įdiegimas nepavyko"
 
-#: ../rpmdrake:1974
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1822,26 +2108,28 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1988
-#, fuzzy
+#: ../rpmdrake:2013
+#, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Ruošiamasi..."
 
-#: ../rpmdrake:1991
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
 
-#: ../rpmdrake:2006
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "negaliu prieiti prie rpm bylos [%s]"
 
-#: ../rpmdrake:2040
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1849,46 +2137,48 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:2048
-#, fuzzy
+#: ../rpmdrake:2073
+#, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "Saugumo atnaujinimai"
 
-#: ../rpmdrake:2050
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:2058
-#, fuzzy
+#: ../rpmdrake:2083
+#, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "Negaliu atidaryti paketo"
 
-#: ../rpmdrake:2061
-#, fuzzy, perl-format
+#: ../rpmdrake:2086
+#, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "Negaliu atidaryti paketo"
 
-#: ../rpmdrake:2073 ../rpmdrake.pm:724 ../rpmdrake.pm:805 ../rpmdrake.pm:829
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Klaida"
 
-#: ../rpmdrake:2074
-#, fuzzy
+#: ../rpmdrake:2099
+#, fuzzy, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake:2099
-#, fuzzy
+#: ../rpmdrake:2124
+#, fuzzy, c-format
 msgid "Please wait, removing packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../rpmdrake:2110
-#, fuzzy
+#: ../rpmdrake:2135
+#, fuzzy, c-format
 msgid "Problem during removal"
 msgstr "Įdiegimo metu įvyko klaida"
 
-#: ../rpmdrake:2111
-#, fuzzy, perl-format
+#: ../rpmdrake:2136
+#, fuzzy, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1898,11 +2188,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2143
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Sveiki"
 
-#: ../rpmdrake:2148
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1910,8 +2202,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:2153
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1919,11 +2211,13 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:2158
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:2159
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1932,176 +2226,213 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:103
-#, fuzzy
-msgid "Mandriva Linux Update"
-msgstr "Skaidrių šou"
-
-#: ../rpmdrake.pm:103
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
+msgid "Mandriva Linux Update"
+msgstr "Skaidrių šou"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Naudotojo vardas:"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr ""
 
-#: ../rpmdrake.pm:175
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake.pm:176
-#, fuzzy
+#: ../rpmdrake.pm:177
+#, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Ruošiamasi paketo diegimui"
 
-#: ../rpmdrake.pm:218
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:222
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Taip"
 
-#: ../rpmdrake.pm:272
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australija"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brazilija"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Šveicarija"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Čekija"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Vokiečių"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:399 ../rpmdrake.pm:403
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Graikija"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Ispanija"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Suomija"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Prancūzija"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Vengrija"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Izraelis"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italija"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japonija"
 
-#: ../rpmdrake.pm:408
-#, fuzzy
+#: ../rpmdrake.pm:409
+#, fuzzy, c-format
 msgid "Korea"
 msgstr "Dar"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Olandija"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norvegija"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Lenkija"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugalija"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Švedija"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapūras"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakija"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taivanas"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Jungtinė karalystė"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Kinija"
 
-#: ../rpmdrake.pm:420 ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Jungtinės amerikos valstijos"
 
-#: ../rpmdrake.pm:520
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2109,7 +2440,8 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2117,28 +2449,30 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:530 ../rpmdrake.pm:568
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:533
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 
-#. - seems that value is bitten before being printed by next func..
-#: ../rpmdrake.pm:541
+#: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Klaida siunčiant"
 
-#: ../rpmdrake.pm:543
-#, perl-format
+#: ../rpmdrake.pm:544
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2147,8 +2481,8 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:548
-#, perl-format
+#: ../rpmdrake.pm:549
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2157,16 +2491,18 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm:558
-#, fuzzy
+#: ../rpmdrake.pm:559
+#, fuzzy, c-format
 msgid "No mirror"
 msgstr "Lemtinga klaida"
 
-#: ../rpmdrake.pm:560
+#: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2175,71 +2511,73 @@ msgid ""
 "by Mandriva Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm:580
-#, fuzzy
+#: ../rpmdrake.pm:581
+#, fuzzy, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 "Prašom palaukti\n"
 "Gabenamas veidrodžių sąrašas"
 
-#: ../rpmdrake.pm:633
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:636
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:643
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:647
-#, fuzzy
+#: ../rpmdrake.pm:648
+#, fuzzy, c-format
 msgid " failed!"
 msgstr "%d bylos"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:651
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:655
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:656
+#, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "Tikrinu '%s' parašą..."
 
-#: ../rpmdrake.pm:659
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:662
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:673
-#, fuzzy
+#: ../rpmdrake.pm:674
+#, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../rpmdrake.pm:700
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:701
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2249,26 +2587,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:732
-#, fuzzy
+#: ../rpmdrake.pm:734
+#, fuzzy, c-format
 msgid "Update media"
 msgstr "Atnaujinti laikmeną"
 
-#: ../rpmdrake.pm:737
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 
-#: ../rpmdrake.pm:762
+#: ../rpmdrake.pm:764
+#, c-format
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: ../rpmdrake.pm:783
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2276,28 +2617,28 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:806 ../rpmdrake.pm:817
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:829
-#, fuzzy
+#: ../rpmdrake.pm:831
+#, fuzzy, c-format
 msgid "Unable to create medium."
 msgstr "Nepavyko sukurti raporto bylos, nutraukiu.\n"
 
-#: ../rpmdrake.pm:834
-#, fuzzy
+#: ../rpmdrake.pm:836
+#, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr ""
 "Prašom palaukti\n"
 "Išmetama laikmena"
 
-#: ../rpmdrake.pm:835
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:837
+#, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2307,27 +2648,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:848
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:851
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:868
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2617,9 +2960,6 @@ msgstr "Programinės įrangos įdiegimas"
 #~ msgid "No package found for installation."
 #~ msgstr "Ruošiamasi paketo diegimui"
 
-#~ msgid "Stop"
-#~ msgstr "Stop"
-
 #, fuzzy
 #~ msgid "All packages, by medium repository"
 #~ msgstr "0 paketų, 0 baitų"
diff --git a/po/lv.po b/po/lv.po
index b46560d5..98fe675c 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,19 +11,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -37,17 +40,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "Parasti jauninājumi"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -63,90 +67,106 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Lūdzu gaidiet, atjuaninu datu nesēju"
 
-#: ../edit-urpm-sources.pl:134
-#, fuzzy
+#: ../edit-urpm-sources.pl:144
+#, fuzzy, c-format
 msgid "Add a medium"
 msgstr "Pievienoju avotu:"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Lokālie faili"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Ceļš:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP serveris"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP serveris"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP serveris"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Ceļš uz montēšanas punktu:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Atvienojama ierīce"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Ceļš uz montēšanas punktu:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Pārlūkot..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Lietotājs:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relatīvais čeļš uz synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Vārds:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr ""
 "Lūdzu izvēlieties avotus,\n"
 "kurus vēlaties atnunot:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -154,117 +174,132 @@ msgstr ""
 "Jau ir datu nesējs ar šādu vārdu,\n"
 "vai tiešām vēlaties to aizvietot?"
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy
+#: ../edit-urpm-sources.pl:252
+#, fuzzy, c-format
 msgid "Adding a medium:"
 msgstr "Pievienoju avotu:"
 
-#: ../edit-urpm-sources.pl:245
-#, fuzzy
+#: ../edit-urpm-sources.pl:254
+#, fuzzy, c-format
 msgid "Type of medium:"
 msgstr "Avota tips:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "vienmēr"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "nekad"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Pakotni neizdodas instalēt"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:355
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "Programmatūras pakotņu noņemšana"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Lūdzu gaidiet, atvienoju datu nesēju..."
 
-#: ../edit-urpm-sources.pl:398
-#, fuzzy
+#: ../edit-urpm-sources.pl:405
+#, fuzzy, c-format
 msgid "Edit a medium"
 msgstr "Labot avotu"
 
-#: ../edit-urpm-sources.pl:404
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:411
+#, fuzzy, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Laboju avotu \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Saglabāt izmaiņas"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
-#, fuzzy
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, fuzzy, c-format
 msgid "Proxy..."
 msgstr "Kļūda..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, 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:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Konfigurēt proxy serverus"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
-#, fuzzy
+#: ../edit-urpm-sources.pl:485
+#, fuzzy, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -272,209 +307,247 @@ msgstr ""
 "Ja nepieciešams proxy, ievadiet hosta vārdu un opcionāli portu (sintakse: "
 "<proxy hosts[:ports]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy hosta vārds:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Lietotājs:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:565
-#, fuzzy
+#: ../edit-urpm-sources.pl:577
+#, fuzzy, c-format
 msgid "Add a medium limit"
 msgstr "Pievienoju avotu:"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:651
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:663
+#, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Laboju avotu \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Grupas nosaukums:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokols:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Pievienot"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Noņemt"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grupa"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokols"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Komanda"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(neviens)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Rediģēt..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Pievienot..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Vidējs"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:798
-#, fuzzy
+#: ../edit-urpm-sources.pl:816
+#, fuzzy, c-format
 msgid "Add a key"
 msgstr "Pievienot..."
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:838
-#, fuzzy
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Aizvērt"
+
+#: ../edit-urpm-sources.pl:856
+#, fuzzy, c-format
 msgid "Remove a key"
 msgstr "Noņemt programmatūru"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-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:857
-#, fuzzy
+#: ../edit-urpm-sources.pl:875
+#, fuzzy, c-format
 msgid "Add a key..."
 msgstr "Pievienot..."
 
-#: ../edit-urpm-sources.pl:861
-#, fuzzy
+#: ../edit-urpm-sources.pl:879
+#, fuzzy, c-format
 msgid "Remove key"
 msgstr "Noņemt"
 
-#: ../edit-urpm-sources.pl:877
-#, fuzzy
+#: ../edit-urpm-sources.pl:895
+#, fuzzy, c-format
 msgid "Configure media"
 msgstr "Konfigurēt izejas kodus"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Atļauts?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Atjaunināt"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Pievienot..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Atjaunināt..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Palīdzība"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -484,8 +557,8 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../edit-urpm-sources.pl:1033
-#, fuzzy
+#: ../edit-urpm-sources.pl:1054
+#, fuzzy, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -499,7 +572,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -507,655 +581,903 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Lietojums: %s [OPCIJAS]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
-#, fuzzy
+#: ../rpmdrake:45
+#, fuzzy, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Pieejamība"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arhivēšana"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Rezerves kopēšana"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Cd ierakstīšana"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Kompresija"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Cits"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
-#, fuzzy
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, fuzzy, c-format
 msgid "Books"
 msgstr "Cits"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Komunikācijas"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Datubāzes"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Attīstība"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kernels"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Redaktori"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Izglītība"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Failu rīki"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Spēles"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Piedzīvojumi"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkāde"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Laukumi"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kārtis"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Puzļi"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sports"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Stratēģija"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Novērošana"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimēdijas"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Tīkli"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Pļāpāšana"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Failu pārsūtīšana"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Interneta peidžeris"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Pasts"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Jaunumi"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Attāla piekļūšana"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Ofiss"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Izdevējdarbība"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Zinātnes"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomija"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Bioloģija"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Ķīmija"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Datorzinātne"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Ģeozinātnes"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matemātika"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Čaulas"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Skaņa"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistēma"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Bāze"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Konfigurācija"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Ielāde un inicializācija"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Dzelži"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pakotnes"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Drukāšana"
 
 #
-#: ../rpmdrake:300
-#, fuzzy
+#: ../rpmdrake:317
+#, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Izstrāde"
 
 #
-#: ../rpmdrake:301
-#, fuzzy
+#: ../rpmdrake:318
+#, fuzzy, c-format
 msgid "Deployment"
 msgstr "Izstrāde"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Fonti"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsole"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Bibliotēkas"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Serveri"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Termināļi"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Teksta rīki"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Rotaļlietas"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
-#, fuzzy
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Darbastacija"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Konsoles rīki"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentācija"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Spēļu dators"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Interneta dators"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimēdiju dators"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Tīkla dators (klients)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Biroja dators"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Zinātniska darbastacija"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Grafiskā vide"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Gnome darbastacija"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Darbavirsma"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE darbastacija"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Citas grafiskās darbavirsmas"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Serveris"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Datubāzes"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Ugunsmūris/Maršrutizators"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Tīkla datoru serveris"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Tīmeklis/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, fuzzy, c-format
 msgid "(Not available)"
 msgstr "(Nav pieejams)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Meklēšanas rezultāti"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Meklēšanas rezultāti (neviens)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Lūdzu gaidiet, meklēju..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Pievienojams"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Programmatūras avotu pārvaldnieks"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Stop"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Atjaunināms"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Nav izvēlēts"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Pievienojams"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Izvēlēts"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Nav izvēlēts"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Svarīgums: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Atjaunināšanas iemesls: "
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Drošības atjauninājumi"
 
-#: ../rpmdrake:655 ../rpmdrake:708
-#, fuzzy
+#: ../rpmdrake:696 ../rpmdrake:750
+#, fuzzy, c-format
 msgid "No description"
 msgstr "aprakstos"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Faili:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Izmaiņu žurnāls:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Faili:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Izmaiņu žurnāls:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Patreiz instalētā versija: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Vārds: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versija: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Apjoms: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Kopsavilkums: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Apraksts: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Programmatūras avotu pārvaldnieks"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Vairāk informācijas par pakotni..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Lūdzu izvēlieties"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Ir nepieciešama viena no sekojošām pakotnēm:"
+msgstr[1] "Ir nepieciešama viena no sekojošām pakotnēm:"
+msgstr[2] "Ir nepieciešama viena no sekojošām pakotnēm:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Lūdzu gaidiet, veidoju pakotņu sarakstu..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Nav jauninājuma"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1165,25 +1487,29 @@ 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:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Viss"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:857 ../rpmdrake:1882
-#, fuzzy
+#: ../rpmdrake:964
+#, fuzzy, c-format
 msgid "Information on packages"
 msgstr "Vairāk informācijas par pakotni..."
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Nepieciešams noņemt dažas papildus pakotnes"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1191,19 +1517,20 @@ msgstr ""
 "Lai apmierinātu visas atkarības, ir nepieciešams noņemt arī sekojoša(s) "
 "pakotne(s):"
 
-#: ../rpmdrake:886 ../rpmdrake:895
-#, fuzzy
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr "Pakotni neizdodas instalēt"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:896 ../rpmdrake:961
-#, fuzzy
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, fuzzy, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1213,11 +1540,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Papildus nepieciešamās pakotnes"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1227,138 +1556,166 @@ msgstr ""
 "ir nepieciešams instalēt arī sekojoša(s) pakotne(s):\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr "Pakotni neizdodas instalēt"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Pakotni neizdodas instalēt"
+msgstr[1] "Pakotni neizdodas instalēt"
+msgstr[2] "Pakotni neizdodas instalēt"
 
-#: ../rpmdrake:945
-#, fuzzy, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Atvainojiet, sekojošas pakotnes nevar tikt izvēlētas\"\n"
+"\n"
+msgstr[1] ""
+"Atvainojiet, sekojošas pakotnes nevar tikt izvēlētas\"\n"
+"\n"
+msgstr[2] ""
 "Atvainojiet, sekojošas pakotnes nevar tikt izvēlētas\"\n"
 "\n"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Dažas pakotnes nepieciešams noņemt"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Izvēlēts: %s / brīvā diska vieta: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Izvēles apjoms: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Instalēt"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Neinstalēt"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux izvēles"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Visas pakotnes, pēc alfabēta"
 
-#: ../rpmdrake:1061
-#, fuzzy
+#: ../rpmdrake:1175
+#, fuzzy, c-format
 msgid "All packages, by update availability"
 msgstr "pēc atjauninājuma pieejamības"
 
-#: ../rpmdrake:1062
-#, fuzzy
+#: ../rpmdrake:1176
+#, fuzzy, c-format
 msgid "All packages, by size"
 msgstr "Visas pakotnes,"
 
-#: ../rpmdrake:1063
-#, fuzzy
+#: ../rpmdrake:1177
+#, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "pēc izvēlēšanās statusa"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1065
-#, fuzzy
+#: ../rpmdrake:1179
+#, fuzzy, c-format
 msgid "All packages, by group"
 msgstr "Visas pakotnes,"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Parasti jauninājumi"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Drošības atjauninājumi"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Kļūdu labojumu jauninājumi"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Parasti jauninājumi"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Drošības atjauninājumi"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "vārdos"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "aprakstos"
 
-#: ../rpmdrake:1127
-#, fuzzy
+#: ../rpmdrake:1248
+#, fuzzy, c-format
 msgid "in file names"
 msgstr "failos"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
-#, fuzzy
+#: ../rpmdrake:1279
+#, fuzzy, c-format
 msgid "You need to select some packages first."
 msgstr "Nebija iespējams saņemt izejas pakotnes."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Izvēlētas pa daudz pakotnes"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1374,138 +1731,171 @@ msgstr ""
 "\n"
 "Vai tiešām vēlaties instalēt visas izvēlētās pakotnes?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Fails"
 
-#: ../rpmdrake:1191
-#, fuzzy
+#: ../rpmdrake:1320
+#, fuzzy, c-format
 msgid "/_Update media"
 msgstr "Atjaunot avotus"
 
-#: ../rpmdrake:1201
-#, fuzzy
+#: ../rpmdrake:1331
+#, fuzzy, c-format
 msgid "/_Reset the selection"
 msgstr "Izvēlēties no jauna"
 
-#: ../rpmdrake:1213
-#, fuzzy
+#: ../rpmdrake:1344
+#, fuzzy, c-format
 msgid "/Reload the _packages list"
 msgstr "Pārlādējiet pakotņu sarakstu"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Iziet"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Opcijas"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Programmatūras avotu pārvaldnieks"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
-#, fuzzy
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, fuzzy, c-format
 msgid "/_Show automatically selected packages"
 msgstr "Parādīt automātiski izvēlētās pakotnes"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Palīdzība"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Ziņot kļūdu"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/P_ar..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Meklēt:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Meklēt"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Attīrīt"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Iezīmēt visu"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Pielietot"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Iziet"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
-#, fuzzy
+#: ../rpmdrake:1505
+#, fuzzy, c-format
 msgid "Fatal error"
 msgstr "Ierakstīšanas kļūda\n"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Lūdzu uzgaidiet"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "Sagatavoju instalēšanu"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, fuzzy, c-format
+msgid "Initializing..."
+msgstr "Instalēju:"
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "LAN konfigurācija"
+msgstr "Konfigurācija"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1518,13 +1908,13 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../rpmdrake:1378
-#, fuzzy
+#: ../rpmdrake:1543
+#, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Kļūda pievienojot atjaunošanas datu nesēju"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1534,12 +1924,13 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kā ar rokām izvēlēties spoguļserveri"
 
-#: ../rpmdrake:1390
-#, fuzzy, perl-format
+#: ../rpmdrake:1556
+#, fuzzy, c-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"
@@ -1553,76 +1944,91 @@ msgstr ""
 "\n"
 "Tad pārstartējiet %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "aprakstos"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Lūdzu gaidiet, meklēju pieejamās pakotnes..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Lūdzu gaidiet, nolasu pakotņu datubāzi..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Lūdzu gaidiet, veidoju pakotņu sarakstu..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Lūdzu gaidiet, meklēju pieejamās pakotnes..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Pārbaudu %s"
 
-#: ../rpmdrake:1607
-#, fuzzy
+#: ../rpmdrake:1797
+#, fuzzy, c-format
 msgid "changes:"
 msgstr "Saglabāt izmaiņas"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Noņemt .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Lietojiet .%s kā galveno failu"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Nedarīt neko"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Instalēšana pabeigta"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Pārbaude..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Visas pieprasītās pakotnes tika veiksmīgi instalētas."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
-#, fuzzy
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, fuzzy, c-format
 msgid "Problem during installation"
 msgstr "Instalēšanas laikā radās problēmas"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, fuzzy, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, fuzzy, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake:1709
-#, fuzzy
+#: ../rpmdrake:1901
+#, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Nebija iespējams saņemt izejas pakotnes."
 
-#: ../rpmdrake:1710
-#, fuzzy, perl-format
+#: ../rpmdrake:1902
+#, fuzzy, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Atvainojiet, nebija iespējams paņemt izejas pakotnes."
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1630,70 +2036,96 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Lai apmierinātu visas atkarības,\n"
+"ir nepieciešams instalēt arī sekojoša(s) pakotne(s):\n"
+"\n"
+msgstr[1] ""
+"Lai apmierinātu visas atkarības,\n"
+"ir nepieciešams instalēt arī sekojoša(s) pakotne(s):\n"
+"\n"
+msgstr[2] ""
 "Lai apmierinātu visas atkarības,\n"
 "ir nepieciešams instalēt arī sekojoša(s) pakotne(s):\n"
 "\n"
 
-#: ../rpmdrake:1730
-#, fuzzy, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Noņemt programmatūru"
+msgstr[1] "Noņemt programmatūru"
+msgstr[2] "Noņemt programmatūru"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Sekojošas pakotnes jānoņem, lai varētu atjaunināt pārējās:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Vai ir labi turpināt?"
+msgstr[1] ""
+"Sekojošas pakotnes jānoņem, lai varētu atjaunināt pārējās:\n"
+"\n"
+"%s\n"
+"\n"
+"Vai ir labi turpināt?"
+msgstr[2] ""
 "Sekojošas pakotnes jānoņem, lai varētu atjaunināt pārējās:\n"
 "\n"
 "%s\n"
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../rpmdrake:1741
-#, fuzzy
-msgid "Initializing..."
-msgstr "Instalēju:"
-
-#: ../rpmdrake:1741
-#, fuzzy
-msgid "Package installation..."
-msgstr "Sagatavoju instalēšanu"
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Lūdzu uzgaidiet"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Vai ir labi turpināt?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Nomainiet datu nesēju"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Uzmanību"
 
-#: ../rpmdrake:1794
-#, fuzzy, perl-format
+#: ../rpmdrake:1986
+#, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1707,12 +2139,13 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Instalēšana neizdevās"
 
-#: ../rpmdrake:1804
-#, fuzzy, perl-format
+#: ../rpmdrake:1999
+#, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1722,27 +2155,28 @@ msgstr ""
 "Instalēšana neizdevās, trūkst daži faili.\n"
 "Jūs varbūt vēlaties atjaunināt avotu datubāzi."
 
-#: ../rpmdrake:1819
-#, fuzzy
+#: ../rpmdrake:2013
+#, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Sagatavoju..."
 
-#: ../rpmdrake:1822
-#, fuzzy, perl-format
+#: ../rpmdrake:2016
+#, fuzzy, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalēju pakotnes..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1754,46 +2188,61 @@ 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:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Parasta informācija"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
 msgstr "Vairāk informācijas par pakotni..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
+msgstr "Vairāk informācijas par pakotni..."
+
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Kļūda"
 
-#: ../rpmdrake:1910
-#, fuzzy
+#: ../rpmdrake:2099
+#, fuzzy, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Lūdzu gaidiet, noņemu pakotnes..."
 
-#: ../rpmdrake:1946
-#, fuzzy
+#: ../rpmdrake:2135
+#, fuzzy, c-format
 msgid "Problem during removal"
 msgstr "Problēma instalēšanas laikā"
 
-#: ../rpmdrake:1947
-#, fuzzy, perl-format
+#: ../rpmdrake:2136
+#, fuzzy, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Laipni lūdzam"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1805,8 +2254,8 @@ msgstr ""
 "Šis rīks palīdzēs Jums izvēlēties, kuru programmatūru vēlaties\n"
 "noņemt no datora."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1818,11 +2267,13 @@ msgstr ""
 "Šis rīks palīdzēs Jums izvēlēties atjauninājumus, kurus vēlaties\n"
 "instalēt uz datora."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1836,178 +2287,213 @@ 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:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux atjaunināšana"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "Programmatūras pakotņu noņemšana"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux atjaunināšana"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Lūdzu zemāk ievadiet savu epasta adresi"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Lietotāja vārds:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Programmatūras pakotņu noņemšana"
 
-#: ../rpmdrake.pm:174
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "Programmatūras pakotņu noņemšana"
 
-#: ../rpmdrake.pm:175
-#, fuzzy
+#: ../rpmdrake.pm:177
+#, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Nē"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Jā"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Austrālija"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Beļģija"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brazīlija"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanāda"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Šveice"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Čehija"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Vācija"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Dānija"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grieķija"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Spānija"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Somija"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Francija"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Ungārija"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Izraēla"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Itālija"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japāna"
 
-#: ../rpmdrake.pm:405
-#, fuzzy
+#: ../rpmdrake.pm:409
+#, fuzzy, c-format
 msgid "Korea"
 msgstr "Vairāk"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Holande"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norvēģija"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polija"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugāle"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Krievija"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Zviedrija"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapūra"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovākija"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taivāna"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Apvienotā Karaliste"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Ķīna"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "ASV"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2020,7 +2506,8 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2033,28 +2520,30 @@ msgstr ""
 "\n"
 "Vai ir labi turpināt?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Lūdzu gaidiet, lujuplādēju spoguļserveru sarakstu no Mandriva web vietas."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Lūdzu gaidiet, lujuplādēju spoguļserveru sarakstu no Mandriva web vietas."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2069,7 +2558,7 @@ msgstr ""
 "Lūdzu, mēģiniet vēlreiz vēlāk."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2084,14 +2573,17 @@ msgstr ""
 "Lūdzu, mēģiniet vēlreiz vēlāk."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Nav spoguļservera"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2106,64 +2598,68 @@ msgstr ""
 "oficiālo atjauninājumu puses."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Lūdzu izvēlieties spoguļserveri"
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:653
-#, fuzzy
+#: ../rpmdrake.pm:648
+#, fuzzy, c-format
 msgid " failed!"
 msgstr "failos"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Lūdzu gaidiet, atjuaninu datu nesēju"
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2173,33 +2669,31 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
-#, fuzzy
+#: ../rpmdrake.pm:734
+#, fuzzy, c-format
 msgid "Update media"
 msgstr "Atjaunot avotus"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
-#, fuzzy
+#: ../rpmdrake.pm:746
+#, fuzzy, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 "Lūdzu izvēlieties avotus,\n"
 "kurus vēlaties atnunot:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Iezīmēt visu"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Atjaunināt"
 
-#: ../rpmdrake.pm:789
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:785
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2207,52 +2701,55 @@ msgid ""
 "%s"
 msgstr "Nav iespējams atjaunināt datu nesēju; tas tiks automātiski atslēgts."
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Nevaru izveidot datu nesēju."
 
-#: ../rpmdrake.pm:840
-#, fuzzy
+#: ../rpmdrake.pm:836
+#, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Lūdzu gaidiet, pievienoju datu nesēju..."
 
-#: ../rpmdrake.pm:841
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:837
+#, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
 "%s"
 msgstr "Tiek sagatavota instalēšana"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2530,20 +3027,21 @@ msgstr "Noņemt programmatūru"
 msgid "Software Media Manager"
 msgstr "Programmatūras avotu pārvaldnieks"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Lūdzu gaidiet, nolasu pakotņu datubāzi..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "rpmdrake"
+
 #, fuzzy
 #~ msgid "No package found for installation."
 #~ msgstr "Tiek sagatavota instalēšana"
 
-#~ 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"
 
@@ -2564,10 +3062,6 @@ msgstr "Programmatūras avotu pārvaldnieks"
 #~ msgid "Keys"
 #~ msgstr "Taustiņi"
 
-#, fuzzy
-#~ msgid "Rpmdrake %s"
-#~ msgstr "rpmdrake"
-
 #~ msgid "/_View"
 #~ msgstr "/_Skats"
 
diff --git a/po/mk.po b/po/mk.po
index 17e17942..672f9fe2 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-09-18 11:29+0200\n"
 "Last-Translator: Зоран Димовски <zoki.dimovski@gmail.com>\n"
 "Language-Team: Macedonian\n"
@@ -18,12 +18,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Изберете тип на медиум"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -49,16 +52,18 @@ msgstr ""
 "мора\n"
 "да го направете во два чекора.)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Извори на дистрибуција"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Официјални надградби"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -78,84 +83,104 @@ msgstr ""
 "\n"
 "Дали сакате да продолжиме?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Ве молиме почекајте, додавање на медиум..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Додај медиум"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Локални датотеки"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Патека:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP сервер"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC сервер"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP сервер"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Пат или точка на монтирање:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Уред со менливи медиуми"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Пат или точка на монтирање:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Разгледај..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Најава:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Релативен пат до synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Ако е празно, synthesis/hdlist ќе се бара автоматски"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Име:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Создади медиум за цела дистрибуција"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Пребарај го овој медиум за надоградби"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Треба да ги пополните барем првите две ставки."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -163,109 +188,132 @@ msgstr ""
 "Веќе постои медиум со тоа име, дали\n"
 "навистина сакате го замените?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Додавање нов медиум:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Тип на медиум:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "ОК"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Општи подесувања за инсталирање на пакети..."
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "секогаш"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "никогаш"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Потврди ги RPM пакетите за инсталирање:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Преземи ја програмата за употреба:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Отстранување на извор"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Дали навистина сакате да го отстраните изворот \"%s\"?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Почекајте, медиумот се отстранува..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Уредување на медиум"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Уредување на медиумот \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Снимање на промените"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Прокси..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Треба да го вметнете медиумот за да продолжите"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "За да ги зачувате промените, треба да го вметнете медиумот во уредот."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Поставување на проксија"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Прокси подесувања за медиум \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Глобални прокси подесувања"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -273,138 +321,172 @@ msgstr ""
 "Ако е потребно прокси, внесете го хостот и (ако сакате) портата(синтакса: "
 "<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Прокси-хост:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Можете да наведете корисник/лозинка за најавување на проксито:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Корисник:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Додајте паралелна група"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Сменете ја паралелната група"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Додајте медиумски лимит"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Изберете медиум за додавање на медиумскиот лимит:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Додајте хост"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Внесете го името на хостот или неговата IP-адреса:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Менување на паралелната група \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Името на групата:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Медиумски лимит:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Додај"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Отстрани"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Хостови:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Конфигурирање на паралелен urpmi (дистрибуирано извршување на urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Група"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Медиумски лимит"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Медиумски лимит"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(нема)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Уреди"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Додај..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Менаџмент на клучевите за електронските потписи на пакетите"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Медиум"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Клучеви"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "името не е најдено, клучот не постои во rpm keyring!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Додај клуч"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Изберете клуч за додавање на медиумот %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Затвори"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Отстрани клуч"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -412,32 +494,38 @@ msgstr ""
 "Дали сте сигурни дека сакате да го отстраните клучот %s од медиумот %s? (име "
 "на клучот: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Додај клуч..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Отстрани клуч"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Конфигурирање на медиум"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Овозможено?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Надоградби?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "За да се користи, медиумот треба да се надгради. Надгради сега?"
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -447,32 +535,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Додај сопствено..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Ажурирање..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Менаџмент на клучеви..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Паралели..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Општи подесувања..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Помош"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -482,7 +576,8 @@ msgstr ""
 "\n"
 "Да продолжиме?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -497,7 +592,8 @@ msgstr ""
 "да се користат на Вашиот компјутер. Потоа, од тие медиуми ќе може да се\n"
 "инсталираатнови пакети со софтвер или да се вршат ажурирања на истите. "
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -508,12 +604,13 @@ msgstr ""
 "што работат со неа (дали имате друг менаџер на медиуми на некој\n"
 "друг десктоп, или пак моментално инсталирате некои пакети?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Не може да се додаде медиумот, погрешни или нецелосни параметри"
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -523,8 +620,8 @@ msgstr ""
 "Тоа значи дека ќе можете да додавате нови софтверски пакети\n"
 "на Вашиот ситем од овие нови медиуми."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -534,22 +631,23 @@ msgstr ""
 "Тоа значи дека во иднина ќе можете да додавате нови\n"
 "пакети со софтвер на Вашиот системо од тој медиум."
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Медиумот „%s“ е успешно додаден."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Медиумот „%s“ е успешно додаден."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Користење: %s [ОПЦИЈА]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -557,39 +655,46 @@ msgstr ""
 "  --changelog-first      ја прикажува  датотеката за измени пред листата со "
 "датотеки вопрозорецот за опис"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     ограничува до даден медиум"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     предложува да ги спои сите пронајдени .rpmnew/."
 "rpmsave датотеки"
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            поставува режим (инсталирај-install (стандарден), "
 "отстрани-remove, ажурирај-update)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      не бара веднаш потврдно прашање во режимот за "
 "ажурирање"
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      не го ажурирај медиумот при подигање"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        не ги проверувај потписите на пакетите"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -597,27 +702,33 @@ msgstr ""
 "  --parallel=alias,host  да е во паралелен режим, користете група \"alias\", "
 "користете мажина  \"host\" за прикажување на потребните зависности"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    прикажи ги само овие датотеки"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      најпрво ги избира овие пакети"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 принуди да се вклучува како root"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           вклучи барање за \"pkg\""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Извршување како обичен корисник"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -627,545 +738,785 @@ msgstr ""
 "Нема да можете да правите модификации на системот,\n"
 "но ќе можете да ја разгледувата постојната база на пакети."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Пристапливост"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Архивирање"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Бекап"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Снимање CD"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Компресија"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Друго"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Книги"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Компјутерски книги"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Прашања (FAQ)"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Како-да (How-to)"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Литература"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Кластер"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Пренесување на пораките"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Сервиси на чекање"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Комуникација"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Бази на податоци"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Развој"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME и GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE и Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Кернел"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Едитори"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Едукација"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Емулатори"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Фајл-алатки"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Игри"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Авантури"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Аркадни"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "На табла"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Карти"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Гатанки"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Спорт"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Стратегии"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Графички десктоп"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM-базиран"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Мониторинг"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Мултимедија"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Мрежа"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Муабети"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Пренос на датотеки"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Инстант пораки"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Новости"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Далечински пристап"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Канцеларија"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Јавни клучеви"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Издаваштво"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Наука"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Астрономија"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Биологија"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Хемија"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Информатика"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Гео-науки"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Школки"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Звук"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Систем"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Основни"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Конфигурација"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Подигање и иницијализација"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Хардвер"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Пакети"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Печатење"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Развој"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Развој"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Фонтови"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Конзола"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Интернационализација"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Кернел и хардвер"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Библиотеки"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Сервери"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Терминали"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Текст-алатки"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Играчки"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Работна станица"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Конзолски алатки"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Документација"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Станица за игри"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Интернет станица"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Мултимедијална станица"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Мрежен компјутер (клиент)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Канцелариски"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Графичка околина"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "„GNOME“ работна станица"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "„IceWm“ работна површина"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "„KDE“ работна станица"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Други графички работни околини"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Сервер"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "База на податоци"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Мрежен компјутер-сервер"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Нема достапни)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Резултати од пребарувањето"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Резултати од пребарувањето нема"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Почекајте, пребарување..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Може да се додадат"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Менаџмент на софвтер"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr ""
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Може да се надградат"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Неселектиран"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Може да се додадат"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Селектиран"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Неселектиран"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Важност: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Причина за надградба: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Совети за сигурност"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Нема опис"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Датотеки:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Дневник за промени:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Датотеки:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Дневник за промени:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Медиум: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Моментално инсталирана верзија: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Име: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Верзија: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Архитектура: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Големина: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Функција: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Опис: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Менаџмент на софвтер"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Повеќе информации за пакетот..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Потребен е еден од следниве пакети:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Изберете"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Потребен е еден од следниве пакети:"
+msgstr[1] "Потребен е еден од следниве пакети:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Почекајте, пакетите се подредуваат..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Нема надградба"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1175,34 +1526,41 @@ msgstr ""
 "достапна надградба за веќе инсталираните пакети,\n"
 "или дека веќе сите надградби сте ги инсталирале."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Сите"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Информации"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Информации за пакетите"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Треба дополнително да се отстранат пакети"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Заради меѓузависностите, и следниве пакети треба да се отстранат:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Некои од пакетите не можат да се отстранат"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1210,7 +1568,8 @@ msgstr ""
 "Жалам, но отстранувањето на овие пакети ќе го расипе системот:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1220,11 +1579,13 @@ msgstr ""
 "следниве пакети:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Потребни се дополнителни пакети"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1234,129 +1595,164 @@ msgstr ""
 "и следниве пакети:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (припаѓа на листата за прескокнување)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Некои од пакетите не можат да бидат инсталирани"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Некои од пакетите не можат да бидат инсталирани"
+msgstr[1] "Некои од пакетите не можат да бидат инсталирани"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Жалам, но следниве пакети не може да бидат селектирани:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Жалам, но следниве пакети не може да бидат селектирани:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Некои пакети треба да се отстранат"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Селектирани: %s / Празен диск-простор: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Големина на селектирани: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Не е достапен опис за овој пакет\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Се случи фаталната грешка: %s."
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Инсталирани"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Нема инсталирани"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s избори"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Избори на Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Сите пакети, по абецеден редослед"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Сите пакети, по достапност на надградби"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Сите пакети, по големина"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Сите пакети, според селектираност"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Само листови, сортирани по датум на инсталирање"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Сите пакети, по група"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Сите надградби"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Сигурностни ажурирања"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Надградби заради бубачки"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Нормални надградби"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Сигурностни ажурирања"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "во имињата"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "во описите"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "во имињата на датотеките"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Грешка: %s изгледа дека е монтиран само за читање."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Прво треба да селектирате некој пакет."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Премногу пакети се селектирани"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1372,133 +1768,175 @@ msgstr ""
 "\n"
 "Дали навистина сакате да ги инсталирате сите изберени пакети?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Датотека"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Ажурирај медиум"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Ресетирај го изборот"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Превчитај ја листата на пакети"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Напушти"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Опции"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Менаџер на медиуми"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Прикажи ги пакетите кои автоматски се изберени"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Помош"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Пријави бубачка"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_За..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "За „Rpmdrake“"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Авторски права (C) %s на „Mandriva“"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "„Rpmdrake“ е алатка за раководење со пакети на „Mandriva Linux“."
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Зоран Димовски - zoki.dimovski@gmail.com\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Најди:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Барај"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Исчисти"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Избери ги сите"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Примени"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Напушти"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Кратко запознавање"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 "Пакетите можете да ги разгледувате низ дрвото со категории на левата страна."
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Можете да ги видите информациите за пакетот со притискање на неговата икона "
 "на десната листа."
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "За да инсталирате, надградувате или отстранувате пакети, само ги штиклирајте."
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Фатална грешка"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Се случи фаталната грешка: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Ве молиме почекајте"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Инсталирање на пакет..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Подготвување..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Потврдување"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1510,12 +1948,13 @@ msgstr ""
 "\n"
 "Да продолжиме?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Веќе постоечки медиум за ажурирање"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1531,12 +1970,13 @@ msgstr ""
 "\n"
 "Потоа, рестатувајте го %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Како рачно да се избере огледало"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1550,56 +1990,73 @@ msgstr ""
 "\n"
 "Потоа, рестартувајте го %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "во описите"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Почекајте, пронаоѓање на достапните пакети..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Почекајте, читање на базата на пакети..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Почекајте, пакетите се подредуваат..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Почекајте, пронаоѓање на достапните пакети..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Инспекција на %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "промени:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Отстрани .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Користење на .%s како главна датотека"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Не прави ништо"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Инсталирањето заврши"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Инспекција..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Сите побарани пакете беа успешно инсталирани."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Проблем при инсталирањето"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1609,17 +2066,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Не можат да се земат изворните пакети."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Жалам, но не можат да се земат изворните пакети. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1631,25 +2089,43 @@ msgstr ""
 "Пријавени грешки:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"За да се задоволат зависностите, ќе се инсталираат следниве %d пакети:\n"
+"%s\n"
+msgstr[1] ""
 "За да се задоволат зависностите, ќе се инсталираат следниве %d пакети:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Отстрани клуч"
+msgstr[1] "Отстрани клуч"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Следниве пакети треба да бидат отстранети,\n"
+"за да може некои други да бидат надградени:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Да продолжиме?"
+msgstr[1] ""
 "Следниве пакети треба да бидат отстранети,\n"
 "за да може некои други да бидат надградени:\n"
 "\n"
@@ -1657,42 +2133,41 @@ msgstr ""
 "\n"
 "Да продолжиме?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Подготвување..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Инсталирање на пакет..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Ве молиме почекајте"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Да продолжиме?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Промена на медиум"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ве молиме внесете го медиумот „%s“ во уредот [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Преземање на пакетот „%s“ (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Потврдување на електронските потписи на пакетите..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Предупредување"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1706,12 +2181,13 @@ msgstr ""
 "\n"
 "Сакате да продолжите со инсталацијата?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Инсталирањето не успеа"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1723,25 +2199,28 @@ msgstr ""
 "\n"
 "Може да ја превчитате ваша база на медиуми."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Подготовка за инсталирање пакети..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Се подготвувам..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталирање на пакетот „%s“ (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "не можам да пристапам на rpm датотеката [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1753,33 +2232,48 @@ msgstr ""
 "Некои конфигурациски датотеки се создадени како „.rpmnew“ или „.rpmsave“,\n"
 "можете да ги проверете и да преземете соодветни мерки:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Овие пакети доваѓаат со информации за ажурирање"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Повеќе информации за пакетот..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Повеќе информации за пакетот... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Грешка"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Неповратна грешка: не е најде пакет за инсталирање."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Почекајте, отстранување на пакети..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Проблем при отстранување"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1789,11 +2283,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Добредојдовте"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1805,8 +2301,8 @@ msgstr ""
 "Оваа алатка ќе Ви помогне да отстраните некој софтвер од\n"
 "Вашиот компјутер."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1818,11 +2314,13 @@ msgstr ""
 "Оваа алатка ќе Ви помогне да изберете надградби што ќе го\n"
 "ажурираат софтверот на Вашиот компјутер."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Добредојдовте во алатката за инсталирање на софтвер!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1836,172 +2334,213 @@ msgstr ""
 "пакети на CDROM или DVD. Оваа алатка ќе Ви помогне да изберете кој софтвер\n"
 "сакате да го инсталирате на Вашиот компјутер."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Ажурирање"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Ажурирање на софтверот"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Ажурирање"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Ве молиме внесете ги вашите податоци за пристапување на прокси\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Корисничко име:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Отстранување на софтверски пакети"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Ажурирање на софтверски пакети"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Инсталирање на софтверски пакети"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Да"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Информации..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Австрија"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Австралија"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Белгија"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Бразил"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Швајцарија"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Чешка"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Германија"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Данска"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Грција"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Шпанија"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Финска"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Франција"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Унгарија"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Израел"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Италија"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Јапонија"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Кореја"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Холандија"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Норвешка"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Полска"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Португалија"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Русија"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Шведска"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Словачка"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Тајван"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Велика Британија"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Кина"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "САД"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2013,7 +2552,8 @@ msgstr ""
 "\n"
 "Да продолжиме?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2026,27 +2566,30 @@ msgstr ""
 "\n"
 "Дали сакате да продолжиме?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Избор на огледала"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Ве молиме почекајте, преземање на адреси со огледала."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Ве молиме почекајте, преземање на адреси со огледала од веб-сајтот на "
 "Mandriva."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Грешка при преземање"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2061,7 +2604,7 @@ msgstr ""
 "Ве молиме обидете се подоцна."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2076,14 +2619,17 @@ msgstr ""
 "Ве молиме обидете се подоцна."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Нема огледало"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Не можам да пронајдам огледало што одговара."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2098,63 +2644,68 @@ msgstr ""
 "официјалните надградби на Mandriva Linux."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Изберете го саканото огледало."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Копирање на датотека за медиумот „%s“..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Испитување на датотека од медиумот „%s“..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Испитување на далечински датотека од медиумот „%s“..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " готово"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " неуспеа!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s од медиумот %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Почнувам со преземање на '%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Префрлање на '%s', преостанато време:%s, брзина:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Префрлање на '%s', брзина:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Почекајте, медиумот се ажурира..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Грешка при преземање на пакетите"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2171,31 +2722,31 @@ msgstr ""
 "обидете\n"
 "подоцна."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Ажурирање на медиум"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Не е пронајден активен медиум. Потребно е да овозможите некој медиум за да "
 "го надградите."
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Изберете го медиумот што сакате да го ажурирате:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Избери ги сите"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Ажурирај"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2207,8 +2758,8 @@ msgstr ""
 "Грешки:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2218,16 +2769,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Не може да се креира медиум."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Неуспех при додавање медиум"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2237,8 +2790,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2248,8 +2801,8 @@ msgstr ""
 "на %s на која што работите (%s).\n"
 "Медиумот ќе биде оневозможен."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2259,11 +2812,13 @@ msgstr ""
 "на Mandriva Linux на која што работите (%s).\n"
 "Медиумот ќе биде оневозможен."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Помошта е активирана во заднина"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2538,3 +3093,6 @@ msgstr "Отстранување софтвер"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Менаџерот на софтверски медиуми"
+
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Почекајте, читање на базата на пакети..."
diff --git a/po/mn.po b/po/mn.po
index 3b37aa04..bae01746 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bootsplash\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +14,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -33,16 +36,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -53,401 +58,489 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Дотоод файлууд"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Зам:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP Сервер"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL хаяг:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP Сервер"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Removable device"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:140
-msgid "Removable device"
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Нэгжих..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Нэвтрэх нэр:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Нууц үг:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Нэр:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Хүчингүй"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Хэрэглэгч:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Нэмэх"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Устгах"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Бүлэг"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Protocol"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
-msgid "Protocol"
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Тушаал"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(байхгүй)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Засах"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Нэмэх..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Дунд"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Хаах"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-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:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Шинэчлэх"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Тусламж"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -456,7 +549,8 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -464,828 +558,1119 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Ашиглалт: %s [СОНГОЛТУУД]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Хэрэглэх тохь"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr ""
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Нөөцлөлт"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr ""
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Шахалт"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Бусад"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr ""
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Холбоо"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr ""
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Хөгжүүлэл"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "С"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr ".desktop"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Цөм"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Боловсруулагч"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr ""
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr ""
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Тоглоом"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr ""
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Сансар"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr ""
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr ""
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr ""
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Спорт"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr ""
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr ""
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "Гном"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "График"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr ""
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Мультимедиа"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Сүлжээ"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr ""
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr ""
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr ""
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr ""
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Мэйл"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Мэдээ"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr ""
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr ""
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Албан газар"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr ""
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr ""
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr ""
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr ""
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr ""
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Математикийн"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr ""
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr ""
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Чимээ"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Систем"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr ""
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Тоноглол"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr ""
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Техник хангамж"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr ""
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Хэвлэх"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr ""
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr ""
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Фонтууд"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr ""
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Серверүүд"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr ""
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr ""
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Наадгай"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, fuzzy, c-format
+msgid "Workstation"
+msgstr "LAN Тохируулга"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr ""
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Баримтжуулалт"
+
+#: ../rpmdrake:341
+#, fuzzy, c-format
+msgid "Game station"
+msgstr "Тоглоом"
+
+#: ../rpmdrake:342
+#, fuzzy, c-format
+msgid "Internet station"
+msgstr "Интернэт"
+
+#: ../rpmdrake:343
+#, fuzzy, c-format
+msgid "Multimedia station"
+msgstr "Мультимедиа"
+
+#: ../rpmdrake:344
+#, fuzzy, c-format
+msgid "Network Computer (client)"
+msgstr "Сүлжээ"
+
+#: ../rpmdrake:345
+#, fuzzy, c-format
+msgid "Office Workstation"
+msgstr "Албан газар"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr ""
+
+#: ../rpmdrake:349
+#, fuzzy, c-format
+msgid "GNOME Workstation"
+msgstr "KDE"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Ширээний компьютер"
+
+#: ../rpmdrake:351
+#, fuzzy, c-format
+msgid "KDE Workstation"
+msgstr "KDE"
+
+#: ../rpmdrake:352
+#, fuzzy, c-format
+msgid "Other Graphical Desktops"
+msgstr "Бусад"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Сервер"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr ""
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Өгөгдлийн сан"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr ""
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "Сүлжээ"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr ""
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Хайлтын үр дүн"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr ""
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr ""
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
 msgstr ""
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Зогсоох"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake:560
-msgid "Not selected"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Тэмдэглэгдсэн"
 
-#: ../rpmdrake:602 ../rpmdrake:651
-#, fuzzy
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr ""
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, fuzzy, c-format
 msgid "Importance: "
 msgstr "Цонтууд импортлох"
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr ""
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Тайлбар алга"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Файлууд:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr ""
 
-#: ../rpmdrake:630
-#, fuzzy
+#: ../rpmdrake:719
+#, fuzzy, c-format
 msgid "Files:\n"
 msgstr "/_Файл"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr ""
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr ""
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Нэр: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Хувилбар: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr ""
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Хэмжээ: "
 
-#. extra empty line
-#: ../rpmdrake:655
-#, fuzzy
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr ""
+
+#: ../rpmdrake:744
+#, fuzzy, c-format
 msgid "Summary: "
 msgstr "Дүгнэлт"
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Тайлбар:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr ""
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Дараах багцуудын нэг нь шаардлагатай:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Дараах багцуудын нэг нь шаардлагатай:"
+msgstr[1] "Дараах багцуудын нэг нь шаардлагатай:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr ""
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr ""
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Бүгд"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr ""
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr ""
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr ""
+#: ../rpmdrake:1053
+#, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] "Дараах багцуудын нэг нь шаардлагатай:"
+msgstr[1] "Дараах багцуудын нэг нь шаардлагатай:"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr ""
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr ""
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Суулга"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Суулга"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr ""
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr ""
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr ""
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr ""
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr ""
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr ""
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Шинэчлэх"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr ""
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr ""
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr ""
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr ""
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr ""
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr ""
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr ""
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr ""
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr ""
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1295,131 +1680,171 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr ""
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr ""
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr ""
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Гарах"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Сонголтууд"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr ""
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr ""
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Тусламж"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Гажигийг мэдээлэх"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/Т_ухай..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, c-format
+msgid "Rpmdrake"
 msgstr ""
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Мандрива удирдлагын төв"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Олох:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Тандах"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Цэвэрлэх"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr ""
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Батлах"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Гарах"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr ""
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
 msgstr ""
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Багц суулгалт..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Урьдчилан бэлдэж байна..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "LAN Тохируулга"
+msgstr "Тохиргоо"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1427,12 +1852,13 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr ""
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1442,12 +1868,13 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1456,74 +1883,91 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "<тайлбар алга>"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
+#: ../rpmdrake:1604
+#, c-format
+msgid "Please wait, listing base packages..."
+msgstr ""
+
+#: ../rpmdrake:1640
+#, c-format
+msgid "Please wait, finding installed packages..."
 msgstr ""
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr ""
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr ""
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake:1639
-#, fuzzy
+#: ../rpmdrake:1829
+#, fuzzy, c-format
 msgid "Installation finished"
 msgstr "Суулгалт боломжтой"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr ""
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr ""
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1531,60 +1975,66 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr "Дараах багцууд суулгагдах гэж байна"
-
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+msgstr[0] "Дараах багцууд суулгагдах гэж байна"
+msgstr[1] "Дараах багцууд суулгагдах гэж байна"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Урьдчилан бэлдэж байна..."
+#: ../rpmdrake:1926
+#, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Багц суулгалт..."
+#: ../rpmdrake:1927
+#, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
+#: ../rpmdrake:1927
+#, c-format
+msgid "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake:1751
-#, fuzzy, perl-format
+#: ../rpmdrake:1945
+#, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "с с"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Анхааруулга"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1593,13 +2043,13 @@ msgid ""
 "Do you want to continue installation?"
 msgstr ""
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
-#, fuzzy
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, fuzzy, c-format
 msgid "Installation failed"
-msgstr "Суулгалтын асуудал"
+msgstr "Хэлбэр!"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1607,25 +2057,28 @@ msgid ""
 "You may want to update your media database."
 msgstr ""
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr ""
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Бэлдэж байна..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "[%s] rpm файл руу хандаж болсонгүй"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1633,44 +2086,61 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, c-format
+msgid "Upgrade information about this package"
+msgstr ""
+
+#: ../rpmdrake:2086
+#, c-format
+msgid "Upgrade information about package %s"
 msgstr ""
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Алдаа"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr ""
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr ""
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Тавтай морил"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1678,8 +2148,8 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1687,11 +2157,13 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1700,174 +2172,213 @@ msgid ""
 "you want to install on your computer."
 msgstr ""
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Software Update"
 msgstr ""
 
-#: ../rpmdrake.pm:102
-msgid "Software Update"
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
 msgstr ""
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Та доор э-шуудангийн хаягаа өгнө үү"
 
-#: ../rpmdrake.pm:130
-#, fuzzy
+#: ../rpmdrake.pm:132
+#, fuzzy, c-format
 msgid "User name:"
 msgstr "Хэрэглэгчийн нэр:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr ""
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr ""
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr ""
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Үгүй"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Тийм"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr ""
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Австри"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Австрали"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Бельги"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Бразил"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Канад"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Швейцарь"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Чех"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Герман"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Грек"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Испани"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Финланд"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Франц"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Унгар"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Изриаль"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Итали"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Япон"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Голланд"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Норвеги"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Польш"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Португали"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Орос"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Швед"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Словак"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Тайван"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Англи"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Хятад"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "АНУ"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1875,7 +2386,8 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1883,25 +2395,28 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -1911,7 +2426,7 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -1921,14 +2436,17 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr ""
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -1938,63 +2456,68 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr ""
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr ""
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:661
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:656
+#, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "Системийг унтрааж байна..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr ""
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2004,29 +2527,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr ""
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr ""
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr ""
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Шинэчлэх"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2034,51 +2557,55 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr ""
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr ""
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2353,15 +2880,9 @@ msgstr ""
 msgid "Software Media Manager"
 msgstr ""
 
-#~ msgid "Stop"
-#~ msgstr "Зогсоох"
-
 #~ msgid "/_View"
 #~ msgstr "/_Үзэмж"
 
-#~ msgid "<no description>"
-#~ msgstr "<тайлбар алга>"
-
 #~ msgid "Booting the system..."
 #~ msgstr "Системийг эхлүүлж байна..."
 
diff --git a/po/nb.po b/po/nb.po
index f0ab1424..db22a6c9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-09-19 17:57+0200\n"
 "Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.com>\n"
@@ -22,12 +22,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Velg medietype"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -51,16 +54,18 @@ msgstr ""
 "deler\n"
 "men må gjøre dette i to steg.)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Distribusjonskilder"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Offisielle oppdateringer"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -78,84 +83,104 @@ msgstr ""
 "\n"
 "Er det greit å fortsette?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Legger til medie..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Legg til et medium"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Sti:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP-tjener"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC-tjener"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP-tjener"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Sti eller monteringspunkt:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Fjernbar enhet"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Sti eller monteringspunkt:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Bla gjennom..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativ sti til syntese/hdliste:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Hvis etterlatt tom, så vil syntese/hdlist automatisk bli sjekket"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Lag medie for hele distribusjonen"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Søk gjennom dette medie for oppdateringer"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -163,109 +188,132 @@ msgstr ""
 "Det er allerede et medium med det navnet, vil du\n"
 "virkelig bytte det ut?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Legger til et medium:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Mediumstype:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Globale valg for pakkeinstallasjon"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "alltid"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "aldri"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Kontroller RPMer som skal installeres:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Program som skal brukes til nedlasting:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Fjerning av kilder"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-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:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Fjerner medium..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Endre et medium"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Endrer medium «%s»:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Lagre endringer"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Mellomtjener..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Du må sette inn mediumet for å fortsette"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Sett opp mellomtjenere"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Mellomtjeneroppsett for medie «%s»"
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Globalt mellomtjeneroppsett"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -273,141 +321,175 @@ msgstr ""
 "Hvis du trenger en mellomtjener, skriv inn vertsnavnet og en port (syntaks: "
 "<mellomtjener-vert[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Mellomtjener-vertsnavn:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Bruker:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Legg til en parallell-gruppe"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Endre en parallellgruppe"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Legg til en mediumgrense"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Velg et medium for å legge til i mediegrensa:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Legg til en vert"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Endre parallellgruppe «%s»:"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Mediegrense:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Legg til"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Verter:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Sett opp parallell-urpmi (distribuert kjøring av urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Mediegrense"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Mediegrense"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Kommando"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Endre..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Legg til..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Håndter nøkler for digitale signaturer av pakker"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Medium"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Nøkler"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Legg til en nøkkel"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Lukk"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Fjern en nøkkel"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -415,33 +497,39 @@ msgstr ""
 "Er du sikker på at du vil fjerne nøkkelen %s fra medium %s?\n"
 "(navn på nøkkelen: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Legg til en nøkkel..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Fjern nøkkel"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Sett opp mediet"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Aktivert?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Oppdateringer?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Dette mediet trenger å bli oppdatert for å være brukbart. Oppdater det nå ?"
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -451,32 +539,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Legg til selvvalgt..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Oppdater..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Håndter nøkler..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Parallell..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Globale innstillinger..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -486,7 +580,8 @@ msgstr ""
 "\n"
 "Er det greit å fortsette?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -501,7 +596,8 @@ msgstr ""
 "på maskinen din. Du vil da få tilgang til nye programvarepakker\n"
 "eller å utføre oppdateringer."
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -513,12 +609,13 @@ msgstr ""
 "på et annet skrivebord, eller driver du å installerer pakker\n"
 "samtidig?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Klarte ikke å legge til medium, feil eller manglende argumenter"
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -528,8 +625,8 @@ msgstr ""
 "Det betyr at du vil være i stand til å legge til nye programvarepakker\n"
 "til ditt system fra disse nye mediene."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -539,60 +636,68 @@ msgstr ""
 "Det betyr at du vil være i stand til å legge til programvarepakker\n"
 "til ditt system fra det nye mediet."
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Medie %s vellykket lagt til."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Medium «%s» vellykket lagt til."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Bruk: %s [OPSJONER]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 "  --changelog-first      vis changelog før filliste i beskrivelsesvinduet"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     begrense til gitte medie"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     foreslå å sammenslå alle .rpmnew/.rpmsave-filer "
 "funnet"
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            sett modus (install (standard), remove, update)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 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:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      ikke oppdater medie under oppstart"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        ikke kontroller pakkesignaturer"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -600,27 +705,33 @@ msgstr ""
 "  --parallel=alias,vert  i parallell-modus, bruker \"alias\"-gruppe, bruker "
 "\"vert\"-maskin for å vise nødvendige avhengigheter"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    vis bare disse pakkene"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      forhåndsvelg disse pakkene"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 tving til å kjøre som root"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pakke         kjør søk etter «pakke»"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Kjører i brukermodus"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -630,545 +741,785 @@ msgstr ""
 "Du vil ikke kunne gjøre noen endringer på systemet,\n"
 "men du kan fortsatt se gjennom den eksisterende databasen."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Tilgjengelighet"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arkivering"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Sikkerhetskopiring"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD-brenning"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Annet"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Bøker"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Databøker"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Ofte stilte spørsmål (Faqs)"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Bruksanvisninger (howto)"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Litteratur"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Klynge (Cluster)"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Meldingsvideresending"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Kø-tjenester"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Kommunikasjon"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Databaser"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Utvikling"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME og GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE og Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kjerne"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Tekstprogrammer"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Undervisning"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulatorer"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Filverktøy"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Spill"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Eventyr"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Brett"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kort"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Puslespill"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategi"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Grafisk skrivebord"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM-basert"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Overvåking"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Nettverk"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Prat"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Filoverføring"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Lynmelding"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Epost"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Nyheter"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Fjerntilgang"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Kontor"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Offentlige nøkler"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publisering"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Vitenskap"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomi"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Kjemi"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Datavitenskap"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geovitenskap"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematikk"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fysikk"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Skall"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Basis"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Oppstart og init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pakking"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Utskrift"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Utrulling"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Utrulling"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsoll"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "Sanntype"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11-bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internasjonalisering"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kjerne og maskinvare"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Biblioteker"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Tjenere"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminaler"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Tekstverktøy"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Leketøy"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Arbeidsstasjon"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Konsollverktøy"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Spillstasjon"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Internettstasjon"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimediastasjon"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Nettverksmaskin (klient)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Kontorarbeidsstasjon"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Grafisk miljø"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME-arbeidsstasjon"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "IceWm-skrivebord"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE-arbeidsstasjon"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Andre grafiske skrivebord"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Tjener"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Database"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Brannmur/ruter"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Nettverksmaskintjener"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Ikke tilgjengelig)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Søkeresultater"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Søkeresultater (ingen)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Søker..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Kan legges til"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Programvarehåndtering"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr ""
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Oppgraderbar"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Ikke valgt"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Kan legges til"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Valgte"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Ikke valgt"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Viktighet: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Grunn til oppdatering: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Sikkerhetsvarsel"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Filer:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Endringslogg:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Filer:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Endringslogg:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Medium: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Nåværende installerte versjon: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versjon: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Arkiktektur: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Størrelse: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Oppsummering: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Programvarehåndtering"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Mer informasjon om pakke..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "En av de følgende pakkene behøves:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Velg"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "En av de følgende pakkene behøves:"
+msgstr[1] "En av de følgende pakkene behøves:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Lister opp pakker..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Ingen oppdatering"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1178,24 +1529,29 @@ msgstr ""
 "noen tilgjengelige oppdateringer for pakkene som er installert på\n"
 "din maskin, eller at du allerede har installert alle sammen."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Alle"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Mer info"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informasjon om pakker"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Noen ytterligere pakker renger å fjernes"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1203,11 +1559,13 @@ msgstr ""
 "På grunn av deres avhengigheter, trenger følgende pakke(r) også å bli "
 "fjernet:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Noen pakker kan ikke fjernes"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1215,7 +1573,8 @@ msgstr ""
 "Beklager, men fjerning av disse pakkene vil ødelegge systemet ditt:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1225,11 +1584,13 @@ msgstr ""
 "vekk nå:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Ytterligere pakker trengs"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1239,129 +1600,164 @@ msgstr ""
 "installeres:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (hører til skip-lista)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Noen pakker kan ikke installeres"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Noen pakker kan ikke installeres"
+msgstr[1] "Noen pakker kan ikke installeres"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Beklager, følgende pakke(r) kan ikke velges:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Beklager, følgende pakke(r) kan ikke velges:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Noen pakker må fjernes"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Valgt: %s / Ledig diskplass: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Valgt størrelse: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Beskrivelse er ikke tilgjengelig for denne pakken\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "En kritisk feil oppsto: %s."
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Installert"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Ikke installert"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s valg"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-valg"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Alle pakker, ved oppdateringstilgjengelighet"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Alle pakker, etter størrelse"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Alle pakker, etter valgstadie"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Bare blader, sortert etter installasjonsdato"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Alle pakker, etter gruppe"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Alle oppdateringer"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Sikkerhetsoppdateringer"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Feilrettingsoppdateringer"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Normale oppdateringer"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Sikkerhetsoppdateringer"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "i navn"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "i beskrivelser"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "i filnavn"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Feil: %s ser ut til å være montert skrivebeskyttet."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Du må velge noen pakker først."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "For mange pakker er valgt"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1377,135 +1773,177 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å installere alle valgte pakker?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Fil"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Oppdater medie"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Nullstill valget"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Last _pakkelisten på nytt"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Avslutt"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Valg"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Mediahåndterer"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Vis valgte pakker automatisk"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapporter feil"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Om..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "Om Rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s ved Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake er Mandriva Linux's pakkehåndteringsverktøy."
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Per Øyvind Karlsen <pkarlsen@mandriva.com>, 2003-2006.\n"
 "Eskild Hustvedt <zerodogg@skolelinux.no>, 2005.\n"
 "Terje Bjerkelia <terje@bjerkelia.com>, 1999-2000.\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Finn:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Søk"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Nullstill"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Velg alle"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Bruk"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Kjapp introduksjon"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "Du kan bla gjennom pakkene i kategoritreet til venstre."
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Du kan vise informasjon om ei pakke ved å klikke på den i den høyre lista."
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "For å installere, oppdatere, eller å fjerne en pakke, bare klikk på dens "
 "avkrysningsboks."
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Kritisk feil"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "En kritisk feil oppsto: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Vennligst vent"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Pakkeinstallasjon..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Klargjør..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Bekreftelse"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1517,12 +1955,13 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Allerede eksisterende oppdateringsmedie"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1538,12 +1977,13 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hvordan velge ditt speil manuelt"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1557,56 +1997,73 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "i beskrivelser"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Finner tilgjengelige pakker..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Leser pakkedatabase..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Lister opp pakker..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Finner tilgjengelige pakker..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Sjekker %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "endringer:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Fjern .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Bruk .%s som hovedfil"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Installasjon ferdig"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Sjekk..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Alle forespurte pakker ble vellykket installert."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Problemer under installasjon"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1616,17 +2073,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Ikke i stand til å få tak i kildepakker."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ikke i stand til å hente kildepakker, beklager. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1638,68 +2096,85 @@ msgstr ""
 "Feil rapportert:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"For å tilfredstille avhengigheter, så vil de følgende %d pakkene bli "
+"installert:\n"
+"%s\n"
+msgstr[1] ""
 "For å tilfredstille avhengigheter, så vil de følgende %d pakkene bli "
 "installert:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Fjern en nøkkel"
+msgstr[1] "Fjern en nøkkel"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Er det ok å fortsette?"
+msgstr[1] ""
 "Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
 "\n"
 "%s\n"
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Klargjør..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Pakkeinstallasjon..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Vennligst vent"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Er det greit å fortsette?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Endre medium"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sett inn medium kalt «%s» på enhet [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laster ned pakke «%s» (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Sjekker pakkersignaturer..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1713,12 +2188,13 @@ msgstr ""
 "\n"
 "Vil du fortsette installasjon?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Installasjon mislyktes"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1730,25 +2206,28 @@ msgstr ""
 "\n"
 "Du vil kanskje oppdatere din mediedatabase."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Forbereder pakker for installasjon..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "klarte ikke å åpne rpm-fil [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1760,33 +2239,48 @@ msgstr ""
 "Noen oppsettsfiler ble opprettet som `.rpmnew' eller `.rpmsave',\n"
 "du kan nå sjekke noen for å utføre handlinger:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Disse pakkene kommer med oppgraderingsinformasjon"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Mer informasjon om pakke..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Mer informasjon om pakke... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Feil"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Uopprettelig feil: ingen pakke ble funnet for installasjon, beklager."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Fjerner pakker..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Problem under fjerning"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1796,11 +2290,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1812,8 +2308,8 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge hvilken programvare du skal fjerne\n"
 "fra maskinen din."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1825,11 +2321,13 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
 "på maskinen din."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Velkommen til installasjonsprogrammet for programvarepakker!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1843,172 +2341,213 @@ msgstr ""
 "på CDROM eller DVD. Dette verktøyet hjelper deg med å velge hvilken\n"
 "programvare du ønsker å installere på maskinen din."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Oppdatering"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Programvareoppdatering"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Oppdatering"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Skriv inn dine referanser for å få tilgang til mellomtjener\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Brukernavn:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Fjerning av Programvarepakker"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Oppdatering av Programvarepakker"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Installasjon av Programvarepakker"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Nei"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Østerrike"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Tjekkiske Republikk"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Hellas"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Spania"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Frankrike"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Hungarn"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norge"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polen"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Russland"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "USA"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2020,7 +2559,8 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2032,25 +2572,28 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Speilvalg"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Laster ned speiladresser, vennligst vent."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Laster ned liste over speil fra Mandriva-nettsiden, vennligst vent."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Feil under nedlasting"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2065,7 +2608,7 @@ msgstr ""
 "Prøv igjen senere."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2080,14 +2623,17 @@ msgstr ""
 "Prøv igjen senere."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Inget speil"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Jeg kan ikke finne noe passende speil."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2102,63 +2648,68 @@ msgstr ""
 "av Mandriva Linux' offisielle oppdateringer."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Velg ønsket speil."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierer fil for medium `%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Kontrollerer fil fra medium `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Kontrollerer ekstern fil fra medium `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " ferdig."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " mislyktes!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s fra medium %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Starter nedlastning av `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Nedlastning av `%s', tid som gjenstår:%s, hastighet:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Nedlastning av `%s', hastighet:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Oppdaterer medie..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Feil ved henting av pakker"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2175,31 +2726,31 @@ msgstr ""
 "rekke det\n"
 "og du bør da prøve på nytt senere."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Oppdaterer medie"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Ingen aktive medium funnet. Du må aktivere ett medie for å kunne oppdatere "
 "dem."
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Velg mediet du ønsker å oppdatere:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Velg alle"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2211,8 +2762,8 @@ msgstr ""
 "Feil:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2222,16 +2773,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Kan ikke opprette medium."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Feil under forsøk på å legge til medium"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2241,8 +2794,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2252,8 +2805,8 @@ msgstr ""
 "versjonen av %s du kjører (%s).\n"
 "Det vil bli deaktivert"
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2263,11 +2816,13 @@ msgstr ""
 "versjonen av Mandriva Linux du kjører (%s).\n"
 "Det vil bli deaktivert"
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Hjelp startet opp i bakgrunn"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2542,3 +3097,6 @@ msgstr "Fjern programvare"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Programvaremediehåndterer"
+
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Leser pakkedatabase..."
diff --git a/po/pa_IN.po b/po/pa_IN.po
index e3e7e309..c055a4a2 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +14,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "ਮਾਧਿਅਮ ਕਿਸਮ ਚੁਣੋ"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -41,16 +44,18 @@ msgstr ""
 "ਕਰ ਸਕਦੇ ਹੋ (ਤੁਸੀਂ ਦੋਵੇ ਵੀ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ ਤੁਹਾਨੂੰ ਇਹ ਦੋ ਪਗ਼ਾਂ ਰਾਹੀਂ ਕਰਨਾ\n"
 "ਪਵੇਗਾ।)।"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "ਡਿਸਟ੍ਰੀਬਿਊਸ਼ਨ ਸਰੋਤ"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "ਅਧਿਕਾਰਿਤ ਨਵੀਨੀਕਰਨ"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -68,86 +73,104 @@ msgstr ""
 "\n"
 "ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਠੀਕ ਹੈ?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾਦਾ ਹੈ..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "ਸਥਾਨਕ ਫਾਇਲਾਂ"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "ਮਾਰਗ:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP ਸਰਵਰ"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP ਸਰਵਰ"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP ਸਰਵਰ"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "ਮਾਰਗ ਜਾਂ ਮਾਊਟ ਥਾਂ:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "ਹਟਾਉਣਯੋਗ ਜੰਤਰ"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "ਮਾਰਗ ਜਾਂ ਮਾਊਟ ਥਾਂ:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "ਝਲਕ..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "ਲਾਗਿੰਨ:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "ਗੁਪਤ-ਕੋਡ:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "ਸੰਸਲੇਸ਼ਣ/hdlist ਲਈ ਅਨੁਸਾਰੀ ਮਾਰਗ:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "ਜੇਕਰ ਖਾਲੀ ਛੱਡਿਆ ਤਾਂ ਸੰਸਲੇਸ਼ਣ/hdlist ਖੁਦ ਪੜਤਾਲ ਹੋਏਗੀ"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "ਨਾਂ:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "ਮੁਕੰਮਲ ਡਿਸਟਰੀਬ੍ਰਿਊਸ਼ ਤੋਂ ਮਾਧਿਅਮ ਬਣਾਓ"
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "ਮਾਧਿਅਮ, ਜਿਸ ਦਾ ਨਵੀਨੀਕਰਨ ਹੈ, ਚੁਣੋ:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "ਤੁਹਾਨੂੰ ਪਹਿਲੇ ਦੋ ਇੰਦਰਾਜ਼ ਭਰਨ ਦੋ ਲੋੜ ਹੈ।"
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -155,109 +178,132 @@ msgstr ""
 "ਇਸ ਨਾਂ ਨਾਲ ਮਾਧਿਅਮ ਪਹਿਲਾਂ ਵੀ ਹੈ, ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ\n"
 "ਤਬਦੀਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "ਮਾਧਿਅਮ ਦੀ ਕਿਸਮ:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਵਿਆਪਕ ਚੋਣ"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "ਹਮੇਸ਼ਾ"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "ਕਦੇਂ ਨਹੀਂ"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "ਇੰਸਟਾਲ ਹੋਣ ਵਾਲੇ RPM ਦੀ ਪੜਤਾਲ:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "ਵਰਤਣ ਲਈ ਕਾਰਜ ਡਾਊਨਲੋਡ:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "ਸਰੋਤ ਹਟਾਓ"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਰੋਤ \"%s\" ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਮਾਧਿਅਮ ਹਟਾਇਆ ਜਾਦਾ ਹੈ..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "ਮਾਧਿਅਮ ਸੋਧ"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "ਮਾਧਿਅਮ \"%s\" ਸੋਧ:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "ਪਰਾਕਸੀ..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "ਤੁਹਾਨੂੰ ਜਾਰੀ ਰੱਖਣ ਲਈ ਮਾਧਿਅਮ ਪਾਉਣ ਦੀ ਲੋੜ ਹੈ"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣ ਲਈ, ਤੁਹਾਨੂੰ ਡਰਾਇਵ ਵਿੱਚ ਮਾਧਿਅਮ ਪਾਉਣਾ ਪਵੇਗਾ।"
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "ਪਰਾਕਸੀ ਸੰਰਚਨਾ"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ ਪਰਾਕਸੀ ਵਿਵਸਥਾ"
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "ਵਿਆਪਕ ਪਰਾਕਸੀ ਵਿਵਸਥਾ"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -265,138 +311,172 @@ msgstr ""
 "ਜੇਕਰ ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਦੀ ਲੋੜ ਹੈ ਤਾਂ, ਮੇਜ਼ਬਾਨ ਨਾਂ ਅਤੇ ਚੋਣਵੀਂ ਪੋਰਟ ਦਿਓ (ਸੰਟੈਕਸ: <proxyhost[:port]"
 ">):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "ਪਰਾਕਸੀ ਮੇਜ਼ਬਾਨ ਨਾਂ:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "ਤੁਹਾਨੂੰ ਪਰਾਕਸੀ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਉਪਭੋਗੀ ਨਾਂ/ਗੁਪਤ-ਕੋਡ ਦੇਣਾ ਪਵੇਗਾ:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "ਉਪਭੋਗੀ:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "ਸਮਾਂਤਰ ਸਮੂਹ ਸ਼ਾਮਲ"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "ਸਮਾਂਤਰ ਸਮੂਹ ਸੋਧ"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "ਮਾਧਿਅਮ ਸੀਮਾ ਸ਼ਾਮਲ"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "ਮਾਧਿਅਮ ਸੀਮਾ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਲ਼ਈ ਮਾਧਿਅਮ ਚੁਣੋ:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "ਮੇਜ਼ਬਾਨ ਸ਼ਾਮਲ"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "ਸ਼ਾਮਲ ਹੋਣ ਵਾਲੇ ਮੇਜ਼ਬਾਨ ਦਾ ਮੇਜ਼ਬਾਨ ਨਾਂ ਜਾਂ IP ਲਿਖੋ:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "ਸਮਾਂਤਰ ਸਮੂਹ \"%s\" ਸੰਪਾਦਨ:"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "ਸਮੂਹ ਨਾਂ:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "ਮਾਧਿਅਮ ਸੀਮਾ:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "ਸ਼ਾਮਲ"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "ਹਟਾਓ"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "ਮੇਜ਼ਬਾਨ:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "ਸਮਾਂਤਰ urpmi ਸੰਰਚਨਾ (urpmi ਦਾ ਵੰਡ ਅਪਵਾਦ)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "ਸਮੂਹ"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "ਮਾਧਿਅਮ ਸੀਮਾ"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "ਮਾਧਿਅਮ ਸੀਮਾ"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "ਕਮਾਂਡ"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(ਕੋਈ ਨਹੀਂ)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "ਸੋਧ"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "ਸ਼ਾਮਲ..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "ਪੈਕੇਜਾਂ ਦਾ ਡਿਜ਼ੀਟਲ ਦਸਤਖਤਾਂ ਲਈ ਕੁੰਜੀ ਪ੍ਰਬੰਧਨ"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "ਮਾਧਿਅਮ"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "ਕੋਈ ਨਾਂ ਨਹੀਂ ਲੱਭਿਆ, rpm ਕੀਰਿੰਗ ਵਿੱਚ ਕੁੰਜੀ ਨਹੀਂ ਹੈ!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "ਕੁੰਜੀ ਸ਼ਾਮਲ"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "ਮਾਧਿਅਮ %s ਤੇ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਕੁੰਜੀ ਚੁਣੋ"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "ਬੰਦ ਕਰੋ"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "ਕੁੰਜੀ ਹਟਾਓ"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -404,33 +484,38 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਕੁੰਜੀ %s ਨੂੰ ਮਾਧਿਅਮ %s ਤੋਂ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?\n"
 "(ਕੁੰਜੀ ਦਾ ਨਾਂ: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "ਕੁੰਜੀ ਸ਼ਾਮਲ..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "ਕੁੰਜੀ ਹਟਾਓ"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "ਮਾਧਿਅਮ ਸੰਰਚਨਾ"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "ਯੋਗ?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "ਨਵੀਨੀਕਰਨ"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -440,32 +525,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "ਪਸੰਦ ਸ਼ਾਮਲ..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "ਨਵੀਨੀਕਰਨ..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "ਕੁੰਜੀ ਪ੍ਰਬੰਧਨ..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "ਸਮਾਂਤਰ..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "ਵਿਆਪਕ ਚੋਣ..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "ਸਹਾਇਤਾ"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -475,7 +566,8 @@ msgstr ""
 "\n"
 "ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਠੀਕ ਹੈ?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -489,7 +581,8 @@ msgstr ""
 "ਸਹਾਇਕ ਹੁੰਦਾ ਹੈ। ਤਦ ਉਹ ਤੁਹਾਨੂੰ ਨਵੇਂ ਸਾਫਟਵੇਅਰ ਪੈਕੇਜ ਇੰਸਟਾਲ ਜਾਂ ਨਵੀਨੀਕਰਨ ਕਰਨ\n"
 "ਲਈ ਸਹਿਯੋਗੀ ਹੁੰਦੇ ਹਨ।"
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -501,12 +594,13 @@ msgstr ""
 "ਇਸ ਸਮੇਂ ਕੋਈ ਹੋਰ ਪੈਕੇਜ ਵੀ ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ\n"
 "ਕਰ ਰਹੋ ਹੋ?)।"
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਤੋਂ ਅਸਫਲ, ਗਲਤ ਜਾਂ ਗੁੰਮ ਮੁੱਲ"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -516,8 +610,8 @@ msgstr ""
 "ਇਸ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਸਿਸਟਮ ਤੇ ਸਾਫਟਵੇਅਰ\n"
 "ਪੈਕੇਜ ਨਵੇਂ ਮਾਧਿਅਮ ਰਾਹੀਂ ਵੀ ਇੰਸਟਾਲ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -527,80 +621,94 @@ msgstr ""
 "ਇਸ ਦਾ ਅਰਥ ਹੈ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਸਿਸਟਮ ਤੇ ਸਾਫਟਵੇਅਰ\n"
 "ਪੈਕੇਜ ਨਵੇਂ ਮਾਧਿਅਮ ਰਾਹੀਂ ਵੀ ਇੰਸਟਾਲ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../gurpmi.addmedia:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "ਸਫਲਤਾਪੂਰਕ ਮਾਧਿਅਮ `%s' ਸ਼ਾਮਲ ਕੀਤਾ।"
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "ਸਫਲਤਾਪੂਰਕ ਮਾਧਿਅਮ `%s' ਸ਼ਾਮਲ ਕੀਤਾ।"
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr ""
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "ਉਪਭੋਗੀ ਢੰਗ ਨਾਲ ਚਲਾਓ"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -610,547 +718,785 @@ msgstr ""
 "ਤੁਸੀਂ ਇਸ ਨਾਲ ਸਿਸਟਮ ਤੇ ਕੋਈ ਸੋਧ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ,\n"
 "ਪਰ ਮੌਜੂਦਾ ਡਾਟਾਬੇਸ ਦੀ ਝਲਕ ਤਾਂ ਵੇਖ ਸਕਦੇ ਹੋ।"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "ਸਹਾਇਕ"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Archiving"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "ਪਿੱਛੇ"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "CD ਲੇਖਕ"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "ਨਪੀੜਨ"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "ਹੋਰ"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "ਕਿਤਾਬਾਂ"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "ਕੰਪਿਊਟਰ ਕਿਤਾਬਾਂ"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "ਸਵਾਲ ਜਵਾਬ"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "ਕਿਵੇਂ"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "ਸਾਹਿਤ"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "ਕਲਾਸਟਰ"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "ਸੁਨੇਹਾ ਸੰਚਾਰ"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "ਕਤਾਰ ਸੇਵਾਵਾਂ"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "ਸੰਚਾਰ"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "ਡਾਟਾਬੇਸ"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "ਵਿਕਾਸ"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ਅਤੇ GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "ਜਾਵਾ"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE ਅਤੇ Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "ਕਰਨਲ"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "ਪਰਲ"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "ਪਾਈਥਾਨ"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "ਸੰਪਾਦਕ"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "ਵਿਦਿਅਕ"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulators"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "ਫਾਇਲ ਸੰਦ"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "ਖੇਡਾਂ"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "ਰੌਚਕ ਕਾਰਨਾਮੇ"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "ਅਰਕਾਡੀ"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "ਬੋਰਡ"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "ਕਾਰਡ"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "ਪਹੇਲੀਆਂ"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "ਖੇਡਾਂ"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "ਨੀਤੀ"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "ਗਰਾਫਿਕਲ ਵਿਹੜਾ"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "ਸਪਸ਼ਟੀਕਰਨ"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM ਅਧਾਰਤ"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "ਗਨੋਮ"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "ਗ੍ਰਾਫਿਕਸ"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "ਨਿਗਰਾਨੀ"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "ਬਹੁਰੰਗ"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "ਵੀਡਿਓ"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "ਨੈਟਵਰਕਿੰਗ"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "ਗੱਲਬਾਤ(ਚੈਟ)"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "ਫਾਇਲ ਸੰਚਾਰ"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "ਪੱਤਰ"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "ਖ਼ਬਰਾਂ"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "ਰਿਮੋਟ ਪਹੁੰਚ"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "ਦਫ਼ਤਰ"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "ਸਵਰਜਨਕ ਕੁੰਜੀਆਂ"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "ਪ੍ਰਕਾਸ਼ਨ"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "ਵਿਗਿਆਨ"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "ਤਾਰਾ ਵਿਗਿਆਨ"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "ਜੀਵ-ਵਿਗਿਆਨ"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "ਰਸਾਇਣ ਵਿਗਿਆਨ"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "ਕੰਪਿਊਟਰ ਵਿਗਿਆਨ"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geosciences"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "ਗਣਿਤ"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "ਭੌਤਿਕ ਵਿਗਿਆਨ"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "ਸ਼ੈਲਾਂ"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "ਧੁਨੀ"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "ਸਿਸਟਮ"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "ਮੂਲ"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "ਸੰਰਚਨਾ"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Boot ਅਤੇ Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "ਜੰਤਰ"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "ਪੈਕੇਜ"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "ਛਪਾਈ"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "ਵੰਡ"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "ਵੰਡ"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "ਫੋਂਟ"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "ਕੋਂਸੋਲ"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 ਬਿੱਟਮੈਪ"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "ਅੰਤਰਰਾਸ਼ਟਰੀਕਰਨ"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "ਕਰਨਲ ਤੇ ਜੰਤਰ"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "ਲਾਇਬ੍ਰੇਰੀ"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "ਸਰਵਰ"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "ਟਰਮੀਨਲ"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "ਪਾਠ ਸੰਦ"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "ਖਿਡੌਣੇ"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "ਵਰਕਸਟੇਸ਼ਨ"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "ਕੰਸੋਲ ਸੰਦ"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "ਦਸਤਾਵੇਜ਼"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "ਖੇਡ ਸਟੇਸ਼ਨ"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "ਇੰਟਰਨੈੱਟ ਸਟੇਸ਼ਨ"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "ਮਲਟੀਮੀਡੀਆ ਸਟੇਸ਼ਨ"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ (ਕਲਾਂਈਟ)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "ਦਫਤਰ ਵਰਕਸਟੇਸ਼ਨ"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "ਗਰਾਫੀਕਲ ਵਾਤਾਵਰਨ"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "ਗਨੋਮ ਵਰਕਸਟੇਸ਼ਨ"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "ਵਿਹੜਾ"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "ਕੇ ਡੀ ਈ ਵਰਕਸਟੇਸ਼ਨ"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "ਹੋਰ ਗਰਾਫੀਕਲ ਵਿਹੜੇ"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "ਸਰਵਰ"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "ਡਾਟਾਬੇਸ "
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "ਫਾਇਲਵਾਲ/ਰਾਊਟਰ"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "ਨੈੱਟਵਰਕ ਕੰਪਿਊਟਰ ਸਰਵਰ"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "ਵੈਬ/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(ਉਪਲੱਬਧ ਨਹੀਂ)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "ਖੋਜ ਨਤੀਜੇ"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "ਖੋਜ ਨਤੀਜੇ (ਕੁਝ ਨਹੀਂ)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਖੋਜ ਜਾਰੀ ਹੈ..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "ਸ਼ਾਮਲ ਹੋਣ ਯੋਗ"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "ਸਾਫਟਵੇਅਰ ਮਾਧਿਅਮ ਪ੍ਰਬੰਧਕ"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "ਰੋਕੋ"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "ਨਵੀਨੀਕਰਨ ਯੋਗ"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "ਚੋਣ ਨਹੀਂ"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "ਸ਼ਾਮਲ ਹੋਣ ਯੋਗ"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "ਚੁਣੇ"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "ਚੋਣ ਨਹੀਂ"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "ਖਾਸੀਅਤ: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "ਨਵੀਨੀਕਰਨ ਲਈ ਕਾਰਨ: "
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "ਸੁਰੱਖਿਆ ਨਵੀਨੀਕਰਨ"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "ਕੋਈ ਵੇਰਵਾ ਨਹੀ"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "ਫਾਇਲਾਂ:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Changelog:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "ਫਾਇਲਾਂ:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "ਮੱਧਮ: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "ਮੌਜੂਦਾ ਇੰਸਟਾਲ ਵਰਜਨ: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "ਨਾਂ "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "ਵਰਜਨ:"
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s ਕਿਬਾ"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "ਅਕਾਰ:"
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s ਕਿਬਾ"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "ਸਾਰ:"
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "ਵੇਰਵਾ: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "ਸਾਫਟਵੇਅਰ ਮਾਧਿਅਮ ਪ੍ਰਬੰਧਕ"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "ਪੈਕੇਜਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਦੀ ਲੋੜ ਹੈ:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਚੁਣੋ"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਦੀ ਲੋੜ ਹੈ:"
+msgstr[1] "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਦੀ ਲੋੜ ਹੈ:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਪੈਕੇਜਾਂ ਦੀ ਸੂਚੀ ਤਿਆਰ ਕੀਤੀ ਜਾਦੀ ਹੈ..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "ਕੋਈ ਨਵੀਨੀਕਰਨ ਨਹੀਂ"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1160,34 +1506,41 @@ msgstr ""
 "ਤੇ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ ਜਾਂ ਤੁਸੀਂ ਪਹਿਲਾਂ\n"
 "ਹੀ ਇੰਸਟਾਲ ਕਰ ਲਏ ਹਨ।"
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "ਸਭ"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "ਹੋਰ ਜਾਣਕਾਰੀ"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "ਪੈਕੇਜਾਂ ਤੇ ਜਾਣਕਾਰੀ"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "ਕੁਝ ਹੋਰ ਪੈਕੇਜਾਂ ਨੂੰ ਹਟਾਉਣ ਦੀ ਲੋੜ ਹੈ"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "ਇਹਨਾਂ ਦੀ ਨਿਰਭਰਤਾ ਕਰਕੇ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਨੂੰ ਹਟਾਉਣ ਦੀ ਲੋੜ ਹੈ:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "ਕੁਝ ਪੈਕੇਜ ਹਟਾਏ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1195,7 +1548,8 @@ msgstr ""
 "ਇਹਨਾਂ ਪੈਕੇਜਾਂ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ,:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1205,11 +1559,13 @@ msgstr ""
 "ਪੈਣਗੇ:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "ਹੋਰ ਪੈਕੇਜ ਲੋੜੀਦੇ ਹਨ"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1219,132 +1575,164 @@ msgstr ""
 "ਹੈ:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (ਛੱਡੋ ਸੂਚੀ ਨਾਲ ਸਬੰਧਤ)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਹੋ ਸਕਦੇ ਹਨ"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਹੋ ਸਕਦੇ ਹਨ"
+msgstr[1] "ਕੁਝ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਹੋ ਸਕਦੇ ਹਨ"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"ਮੁਆਫੀ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਚੁਣੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "ਮੁਆਫੀ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਚੁਣੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "ਕੁਝ ਪੈਕੇਜਾਂ ਨੂੰ ਹਟਾਉਣ ਦੀ ਲੋੜ ਹੈ"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "ਚੁਣਿਆ: %s / ਖਾਲੀ ਡਿਸਕ ਥਾਂ : %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "ਚੁਣਿਆ ਅਕਾਰ: %d ਮੈਬਾ"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "ਇਸ ਪੈਕੇਜ ਲਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ\n"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "ਘਾਤਕ ਗਲਤੀ ਆਈ: %s"
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "ਇੰਸਟਾਲ"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "ਇੰਸਟਾਲ"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s ਚੋਣ"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਚੋਣ"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "ਸਭ ਪੈਕੇਜ, ਵਰਣਮਾਲਾ ਰਾਹੀਂ"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "ਸਭ ਪੈਕੇਜ, ਨਵੀਨੀਕਰਨ ਉਪਲੱਬਧਤਾ ਨਾਲ"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "ਸਭ ਪੈਕੇਜ, ਅਕਾਰ ਰਾਹੀਂ"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "ਸਭ ਪੈਕੇਜ, ਚੋਣ ਸਥਿਤੀ ਰਾਹੀਂ"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "ਸੰਖੇਪ ਹੀ, ਇੰਸਟਾਲ ਮਿਤੀ ਨਾਲ ਕ੍ਰਮਬੱਧ"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "ਸਭ ਪੈਕੇਜ, ਸਮੂਹ ਰਾਹੀਂ"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "ਸਧਾਰਨ ਨਵੀਨੀਕਰਨ"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "ਸੁਰੱਖਿਆ ਨਵੀਨੀਕਰਨ"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "ਬੱਗਫਿਕਸ ਨਵੀਨੀਕਰਨ"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "ਸਧਾਰਨ ਨਵੀਨੀਕਰਨ"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "ਸੁਰੱਖਿਆ ਨਵੀਨੀਕਰਨ"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "ਨਾਂ ਵਿੱਚ"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "ਵੇਰਵੇ ਵਿੱਚ"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "ਫਾਇਲ ਨਾਂ ਵਿੱਚ"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "ਗਲਤੀ: %s ਸ਼ਾਇਦ ਪੜਨ ਲਈ ਹੀ ਮਾਊਟ ਕੀਤੀ ਗਈ ਹੈ।"
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਕੁਝ ਹੀ ਪੈਕੇਜ ਚੁਣਨੇ ਚਾਹੀਦੇ ਹਨ"
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "ਬਹੁਤੇ ਪੈਕੇਜ ਚੁਣੇ ਗਏ ਹਨ"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1360,133 +1748,171 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਚੁਣੇ ਪੈਕੇਜਾਂ ਨੂੰ ਇੰਸਟਾਲ ਕਰਨਾ ਹਾਲੇ ਵੀ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/ਫਾਇਲ(_F)"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/ਨਵੀਨੀਕਰਨ ਮਾਧਿਅਮ(_U)"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/ਚੋਣ ਮੁੜ ਨਿਰਧਾਰਨ(_R)"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/ਪੈਕੇਜ ਸੂਚੀ ਮੁੜ ਲੋਡ(_P)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/ਬਾਹਰ(_Q)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/ਚੋਣ(_O)"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "ਸਾਫਟਵੇਅਰ ਮਾਧਿਅਮ ਪ੍ਰਬੰਧਕ"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/ਸਵੈ-ਚਾਲਤ ਚੁਣੇ ਪੈਕੇਜ ਵੇਖਾਓ(_S)"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/ਸਹਾਇਤਾ(_H)"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/ਬੱਗ ਰਿਪੋਰਟ(_R)"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/ਬਾਰੇ(_A)..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "ਮੈਂਡਰਿਵ-ਆਨਲਾਈਨ"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "ਖੋਜ:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "ਖੋਜ"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "ਸਾਫ਼"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "ਸਭ ਚੁਣੋ"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "ਲਾਗੂ ਕਰੋ"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "ਬਾਹਰ"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "ਘਾਤਕ ਗਲਤੀ"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "ਘਾਤਕ ਗਲਤੀ ਆਈ: %s"
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "LAN ਸੰਰਚਨਾ"
+msgstr "ਸੰਰਚਨਾ"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1498,12 +1924,13 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "ਪਹਿਲਾਂ ਮੌਜੂਦਾ ਨਵੀਨੀਕਰਨ ਮਾਧਿਅਮ"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1519,12 +1946,13 @@ msgstr ""
 "\n"
 "ਤਦ, %s ਮੁੜ ਚਲਾਓ।"
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "ਆਪਣਾ ਪ੍ਰਤੀਬਿੰਬ ਖੁਦ ਕਿਵੇਂ ਚੁਣਨਾ ਹੈ"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1538,56 +1966,73 @@ msgstr ""
 "\n"
 "ਤਦ, %s ਮੁੜ ਚਲਾਓ।"
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "ਵੇਰਵੇ ਵਿੱਚ"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਉਪਲੱਬਧ ਪੈਕੇਜ ਖੋਜੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਪੈਕੇਜ ਡਾਟਾਬੇਸ ਪੜਿਆ ਜਾਦਾ ਹੈ..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਪੈਕੇਜਾਂ ਦੀ ਸੂਚੀ ਤਿਆਰ ਕੀਤੀ ਜਾਦੀ ਹੈ..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਉਪਲੱਬਧ ਪੈਕੇਜ ਖੋਜੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "%s ਪੜਤਾਲ ਜਾਰੀ"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "ਤਬਦੀਲ:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr ".%s ਹਟਾਓ"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "ਵਰਤੋਂ .%s ਨੂੰ ਮੁੱਖ ਫਾਇਲ ਵਾਂਗ"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "ਕੁਝ ਨਾ ਕਰੋ"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "ਇੰਸਟਾਲੇਸ਼ ਸਮਾਪਤ"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "ਪੜਤਾਲ..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "ਸਭ ਮੰਗੇ ਪੈਕੇਜ ਸਫਲਤਾਪੂਰਕ ਇੰਸਟਾਲ ਕੀਤੇ ਗਏ ਹਨ।"
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਦੌਰਾਨ ਸਮੱਸਿਆ"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1597,17 +2042,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "ਸਰੋਤ ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "ਸਰੋਤ ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ, ਮੁਆਫੀ। %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1619,67 +2065,83 @@ msgstr ""
 "ਪ੍ਰਾਪਤ ਗਲਤੀ:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"ਨਿਰਭਰਤਾ ਸਮਾਪਤ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:\n"
+"%s\n"
+msgstr[1] ""
 "ਨਿਰਭਰਤਾ ਸਮਾਪਤ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "ਕੁੰਜੀ ਹਟਾਓ"
+msgstr[1] "ਕੁੰਜੀ ਹਟਾਓ"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਹੋਰਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"ਕੀ ਇਹ ਠੀਕ ਹੈ?"
+msgstr[1] ""
 "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਹੋਰਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
 "\n"
 "%s\n"
 "\n"
 "ਕੀ ਇਹ ਠੀਕ ਹੈ?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਠੀਕ ਹੈ?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "ਮਾਧਿਅਮ ਬਦਲੋ"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "ਕਿਪਾ ਕਰਕੇ \"%s\" ਨਾਂ ਮਾਧਿਅਮ [%s] ਜੰਤਰ ਵਿੱਚ ਪਾਓ"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "ਪੈਕੇਜ `%s' (%s/%s) ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "ਪੈਕੇਜ ਦਸਤਖਤਾਂ ਦੀ ਪੜਤਾਲ ਜਾਰੀ..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1693,12 +2155,13 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਸੀਂ ਇੰਸਟਾਲੇਸ਼ਨ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1710,26 +2173,28 @@ msgstr ""
 "\n"
 "ਤੁਸੀਂ ਆਪਣਾ ਮਾਧਿਅਮ ਡਾਟਾਬੇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਚਾਹੁੰਦੇ ਹੋਵੋਗੇ।"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਤਿਆਰੀ ਜਾਰੀ..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm ਫਾਇਲ [%s] ਖੋਲਣ ਲਈ ਅਸਫਲ"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1741,33 +2206,48 @@ msgstr ""
 "ਕੁਝ ਸੰਰਚਨਾ ਫਾਇਲਾਂ ਨੂੰ `.rpmnew' ਜਾਂ `.rpmsave' ਦੇ ਤੌਰ ਤੇ ਬਣਾਇਆ ਗਿਆ ਹੈ,\n"
 "ਤੁਸੀਂ ਇਹਨਾਂ ਤੇ ਪ੍ਰਭਾਵੀ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਪੜਤਾਲ ਕਰ ਸਕਦੇ ਹੋ:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "ਸਧਾਰਨ ਜਾਣਕਾਰੀ"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "ਇਹ ਪੈਕੇਜ ਨਵੀਨੀਕਰਨ ਜਾਣਕਾਰੀ ਨਾਲ ਆਇਆ ਹੈ"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "ਪੈਕੇਜਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "ਪੈਕੇਜ ਬਾਰੇ ਵਧੇਰੇ ਜਾਣਕਾਰੀ... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "ਨਾ-ਪ੍ਰਾਪਤੀ ਯੋਗ ਗਲਤੀ: ਇੰਸਟਾਲੇਸ਼ਨ ਦੌਰਾਨ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਹੈ, ਮੁਆਫੀ"
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਪੈਕੇਜ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "ਹਟਾਉਣ ਦੌਰਾਨ ਸਮੱਸਿਆ"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1777,11 +2257,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "ਜੀ ਆਇਆਂ ਨੂੰ"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1793,8 +2275,8 @@ msgstr ""
 "ਇਹ ਸੰਦ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਤੋਂ ਸਾਫਟਵੇਅਰ ਹਟਾਉਣ ਲਈ ਸਹਿਯੋਗ\n"
 "ਕਰੇਗਾ।"
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1806,11 +2288,13 @@ msgstr ""
 "ਇਹ ਸੰਦ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਤੇ ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਨਵੀਨਤਮ ਪੈਕੇਜਾਂ ਦੀ ਚੋਣ ਕਰਨ ਲਈ\n"
 "ਸਹਾਇਤਾ ਕਰੇਗਾ।"
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "ਸਾਫਟਵੇਅਰ ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਦ ਤੇ ਜੀ ਆਇਆਂ ਨੂੰ!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1824,172 +2308,213 @@ msgstr ""
 "CDROM ਜਾਂ DVD ਤੇ ਉਪਲੱਬਧ ਹੁੰਦੇ ਹਨ। ਇਹ ਸੰਦ ਤੁਹਾਨੂੰ ਆਪਣੇ ਕੰਪਿਊਟਰ ਤੇ ਇੰਸਟਾਲ\n"
 "ਕਰਨ ਲਈ ਇਹਨਾਂ ਪੈਕੇਜਾਂ ਵਿੱਚੋ ਚੋਣ ਕਰ ਲਈ ਸਹਾਇਕ ਹੈ।"
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਨਵੀਨੀਕਰਨ"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "ਸਾਫਟਵੇਅਰ ਨਵੀਨੀਕਰਨ"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "ਮੈਂਡਰਿਵ ਲੀਨਕਸ ਨਵੀਨੀਕਰਨ"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr ""
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "ਉਪਭੋਗਤਾ ਨਾਂ:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "ਸਾਫਟਵੇਅਰ ਹਟਾਉਣ"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "ਸਾਫਟਵੇਅਰ ਪੈਕੇਜ ਨਵੀਨੀਕਰਨ"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "ਸਾਫਟਵੇਅਰ ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "ਨਹੀਂ"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "ਹਾਂ"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "ਜਾਣਕਾਰੀ..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "ਆਸਟਰੀਆ"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "ਅਸਟਰੇਲੀਆ"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "ਬੈਲਜੀਅਮ"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "ਬਰਾਜ਼ੀਲ"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "ਕੈਨੇਡਾ"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "ਸਵਿਟਰਜ਼ਰਲੈਂਡ"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "ਕਾਸਟ ਰੀਕਾ"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "ਚੈੱਕ ਗਣਰਾਜ"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "ਜਰਮਨੀ"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "ਡੈਨਮਾਰਕ"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "ਗਰੀਸ"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "ਸਪੇਨ"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "ਫ਼ਿਨਲੈਂਡ"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "ਫਰਾਂਸ"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "ਹੰਗਰੀ"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "ਇਜ਼ਰਾਈਲ"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "ਇਟਲੀ"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "ਜਾਪਾਨ"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "ਕੋਰੀਆ"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "ਨੀਂਦਰਲੈਂਡ"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "ਨਾਰਵੇ"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "ਪੋਲੈਂਡ"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "ਪੁਰਤਗਾਲ"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "ਰੂਸ"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "ਸਵੀਡਨ"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "ਸਿੰਘਾਪੁਰ"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "ਸਲੋਵਾਕੀਆ"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "ਤਾਈਵਾਨ"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "ਬਰਤਾਨੀਆ"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "ਚੀਨ"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "ਅਮਰੀਕਾ"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2001,7 +2526,8 @@ msgstr ""
 "\n"
 "ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2013,27 +2539,29 @@ msgstr ""
 "\n"
 "ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s ਚੋਣ"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਪ੍ਰਤੀਬਿੰਬ ਸਿਰਨਾਵਾਂ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾਦਾ ਹੈ। "
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਮੈਂਡਰਿਵ ਸਾਫਟ ਵੈਬਸਾਇਟ ਤੋਂ ਪ੍ਰਤੀਬਿੰਬ ਸਿਰਨਾਵਾਂ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾਦਾ ਹੈ। "
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "ਡਾਊਨਲੋਡ ਕਨਰ ਦੌਰਾਨ ਗਲਤੀ"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2048,7 +2576,7 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਕੁਝ ਦੇਰ ਬਾਅਦ ਕੋਸ਼ਿਸ ਕਰੋ।"
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2063,14 +2591,17 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਕੁਝ ਦੇਰ ਬਾਅਦ ਕੋਸ਼ਿਸ ਕਰੋ।"
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "ਕੋਈ ਪ੍ਰਤੀਬਿੰਬ ਨਹੀਂ"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "ਮੈਨੂੰ ਕੋਈ ਠੀਕ ਪ੍ਰਤੀਬਿੰਬ ਨਹੀਂ ਲੱਭਿਆ ਹੈ।"
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2085,63 +2616,68 @@ msgstr ""
 "ਸਹਿਯੋਗ ਨਾ ਹੋਣ।"
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਲੋੜੀਦਾ ਪ੍ਰਤੀਬਿੰਬ ਚੁਣੋ।"
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "ਮਾਧਿਅਮ `%s' ਤੋਂ ਫਾਇਲ ਨਕਲ ਕੀਤੀ ਜਾਦੀ ਹੈ..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "ਮਾਧਿਅਮ `%s' ਦੀ ਫਾਇਲ ਦੀ ਪੜਤਾਲ ਜਾਰੀ ਹੈ..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "ਮਾਧਿਅਮ `%s' ਦੀ ਰਿਮੋਟ ਫਾਇਲ ਦੀ ਪੜਤਾਲ ਜਾਰੀ ਹੈ..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " ਸਮਾਪਤ!"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " ਅਸਫਲ!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s ਤੋਂ ਮਾਧਿਅਮ %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "`%s' ਦਾ ਡਾਊਨਲੋਡ ਸ਼ੁਰੂ..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' ਡਾਊਨਲੋਡ, ਬਾਕੀ ਸਮਾਂ:%s. ਗਤੀ:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' ਦਾ ਡਾਊਨਲੋਡ, ਗਤੀ:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਮਾਧਿਅਮ ਨਵੀਨੀਕਰਨ ਕੀਤਾ ਜਾਦਾ ਹੈ.."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਸਮੇਂ ਗਲਤੀ"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2156,29 +2692,29 @@ msgstr ""
 "ਮੁੜ ਸੰਰਚਿਤ ਕਰ ਸਕਦੇ ਹੋ, ਜਾਂ ਇਸ ਸਮੇਂ ਇਹ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ ਅਤੇ ਤੁਸੀਂ ਬਾਅਦ\n"
 "ਵਿੱਚ ਕੋਸ਼ਿਸ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "ਮਾਧਿਅਮ ਨਵੀਵੀਕਰਨ"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "ਮਾਧਿਅਮ, ਜਿਸ ਦਾ ਨਵੀਨੀਕਰਨ ਹੈ, ਚੁਣੋ:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "ਸਭ ਚੁਣੋ"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "ਨਵੀਨੀਕਰਨ"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2190,8 +2726,8 @@ msgstr ""
 "ਗਲਤੀ:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2201,16 +2737,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "ਮਾਧਿਅਮ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ।"
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2220,8 +2758,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2231,8 +2769,8 @@ msgstr ""
 "ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ।\n"
 "ਇਹ ਆਯੋਗ ਹੋ ਜਾਵੇਗਾ।"
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2242,11 +2780,13 @@ msgstr ""
 "ਵਰਜਨ (%s) ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ।\n"
 "ਇਹ ਆਯੋਗ ਹੋ ਜਾਵੇਗਾ।"
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "ਸਹਾਇਤਾ ਪਿੱਠਵਰਤੀ ਚਲਾਈ ਗਈ ਹੈ"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "ਸਹਾਇਤਾ ਝਰੋਖਾ ਚਲਾਇਆ ਗਿਆ ਹੈ, ਇਹ ਛੇਤੀ ਹੀ ਤੁਹਾਡੇ ਵਿਹੜੇ ਵਿੱਚ ਹੋਏਗਾ।"
@@ -2521,21 +3061,22 @@ msgstr "ਸਾਫਟਵੇਅਰ ਹਟਾਓ"
 msgid "Software Media Manager"
 msgstr "ਸਾਫਟਵੇਅਰ ਮਾਧਿਅਮ ਪ੍ਰਬੰਧਕ"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਪੈਕੇਜ ਡਾਟਾਬੇਸ ਪੜਿਆ ਜਾਦਾ ਹੈ..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਕੋਈ ਪੈਕੇਜ ਨਹੀਂ ਲੱਭਿਆ ਹੈ।"
 
-#~ msgid "Stop"
-#~ msgstr "ਰੋਕੋ"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "ਸਭ ਪੈਕੇਜ, ਮਾਧਿਅਮ ਭੰਡਾਰਨ ਰਾਹੀ"
 
-#~ msgid "Normal information"
-#~ msgstr "ਸਧਾਰਨ ਜਾਣਕਾਰੀ"
-
 #~ msgid "Maximum information"
 #~ msgstr "ਵੱਧ ਤੋਂ ਵੱਧ ਜਾਣਕਾਰੀ"
 
@@ -2557,8 +3098,5 @@ msgstr "ਸਾਫਟਵੇਅਰ ਮਾਧਿਅਮ ਪ੍ਰਬੰਧਕ"
 #~ msgid "Keys"
 #~ msgstr "ਕੁੰਜੀਆਂ"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/ਵੇਖੋ(_V)"
diff --git a/po/pl.po b/po/pl.po
index 0b00d77a..f8e6328d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-09-23 13:23+0200\n"
 "Last-Translator: Tomasz Bednarski - Mandriva Poland <tomasz."
 "bednarski@mandriva.pl>\n"
@@ -23,12 +23,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
+"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Wybierz rodzaj nośnika"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -51,16 +54,18 @@ msgstr ""
 "będziesz\n"
 "przeprowadzić procedurę dwa razy)."
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Nośniki dystrybucji"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Aktualizacje edycji Official"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -79,86 +84,106 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Proszę czekać, dodawanie nośnika..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Dodawanie nośnika"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Lokalne pliki"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Ścieżka:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Serwer FTP"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "Serwer RSYNC"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Serwer HTTP"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Ścieżka lub punkt montowania:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Napęd wymienny"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Ścieżka lub punkt montowania:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Przeglądaj..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Względna ścieżka do pliku syntezy/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Stwórz nośnik dla całej dystrybucji"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Wybierz nośnik(i) do aktualizacji"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -166,109 +191,132 @@ msgstr ""
 "Już istnieje nośnik o tej nazwie, czy naprawdę\n"
 "chcesz go zastąpić?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Dodawanie nośnika:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Rodzaj nośnika:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Ogólne ustawienia dla instalacji pakietów"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "zawsze"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "nigdy"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Weryfikacja instalowanych pakietów RPM:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Pobieranie programu do:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Usuwanie źródeł"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Czy na pewno chcesz usunąć nośnik \"%s\"?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Proszę czekać, usuwanie nośnika..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Modyfikacja nośnika"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Modyfikowanie nośnika \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Zapisz zmiany"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Pośrednik..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Włóż nośnik, aby kontynuować"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Konfiguracja serwera proxy"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Ustawienia pośrednika dla nośnika \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Globalne ustawienia pośrednika"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -276,114 +324,140 @@ msgstr ""
 "Jeśli potrzebujesz proxy, wpisz nazwę komputera oraz opcjonalnie port "
 "(składnia: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Serwer pośrednika:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Użytkownik:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Dodawanie grupy równoległej"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Edycja grupy równoległej"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Dodawanie ograniczenia nośnika"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Dodaj komputer"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Modyfikowanie grupy równoległej \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Ograniczenie nośnika:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Usuń"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Komputery:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfiguracja równoległego urpmi (rozproszone wykonywanie urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grupa"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Ograniczenie nośnika"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokół"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Ograniczenie nośnika"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Polecenie"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(brak)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Modyfikuj..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Zarządzaj kluczami dla podpisów cyfrowych pakietów"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Nośnik"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -391,25 +465,33 @@ msgstr ""
 "Klucze kryptograficzne\n"
 "Klucze"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Dodaj klucz"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Wybierz klucz do dodania do nośnika %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Zamknij"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Usuń klucz"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -417,34 +499,40 @@ msgstr ""
 "Czy na pewno chcesz usunąć klucz %s z nośnika %s?\n"
 "(nazwa klucza: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Dodaj klucz..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Usuń klucz"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Konfiguracja nośników"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Włączone?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Aktualizacje?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Ten nośnik wymaga aktualizacji do dalszego użytkowania. Czy zaktualizować go "
 "teraz?"
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -454,32 +542,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Dodaj dowolny..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Aktualizuj..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Zarządzaj kluczami..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Równolegle..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Ogólne ustawienia..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -489,7 +583,8 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -503,7 +598,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -515,12 +611,13 @@ msgstr ""
 "uruchomionego innego menedżera nośników lub też\n"
 "aktualnie instalowane są jakieś pakiety?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 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:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -530,8 +627,8 @@ msgstr ""
 "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
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -541,22 +638,23 @@ msgstr ""
 "To oznacza, że będzie możliwość dodawania nowych pakietów\n"
 "oprogramowania do systemu z tego nowego nośnika."
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Pomyślnie dodano nośnik %s."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Pomyślnie dodano nośnik \"%s\"."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Użycie: %s [OPCJA]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -564,39 +662,46 @@ msgstr ""
 "  --changelog-first      wyświetla listę zmian w oknie opisu przed podaniem "
 "listy plików"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     ograniczenie do oznaczonego nośnika"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 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:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            wybór trybu (instalacja (domyślny), usuwanie, "
 "aktualizacja)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      w trybie aktualizacji pomija pytanie o "
 "potwierdzenie "
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      pomija aktualizację nośników przy starcie"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        pomija weryfikację podpisów pakietów"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -604,27 +709,33 @@ 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:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    wyświetla wskazane pakiety"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      preselekcja podanych pakietów"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 wymusza uruchomienie jako root"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           szuka wyrażenia \"pkg\""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Uruchamianie w trybie użytkownika"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -634,545 +745,786 @@ msgstr ""
 "Nie będzie można przeprowadzać modyfikacji w systemie,\n"
 "lecz wciąż można będzie przeglądać istniejącą bazę danych."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Dostępność"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Archiwizacja"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Archiwizacja"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Wypalanie płyt CD"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Kompresja"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Inne"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Książki"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Książki komputerowe"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Faq"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Dokumenty HOWTO"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Klaster"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Przekazywanie wiadomości"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Usługi kolejkowania"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Komunikacja"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Bazy Danych"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Rozwijanie programu"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME i GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE i Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Jądro"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Edytory"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Edukacja"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulatory"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Narzędzia plikowe"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Gry"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Przygodowe"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Przygodowe"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Planszowe"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Karty"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Puzzle"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sportowe"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategia"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Pulpit graficzny"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "Oparte na FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "IceWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Monitorowanie"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Wideo"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Sieć"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Pogawędki"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Przesyłanie plików"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Komunikatory"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Poczta"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Nowości"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Zdalny dostęp"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Biuro"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Klucze publiczne"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publikowanie"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Nauka"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologia"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Chemia"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Technika komputerowa"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Nauka o Ziemi"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematyka"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizyka"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Powłoki"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Podstawowe"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Uruchamianie i inicjalizacja"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Sprzęt"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pakowanie"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Drukowanie"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Rozmieszczanie"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Rozmieszczanie"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsola"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "Bitmapa X11"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internacjonalizacja"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Jądro i sprzęt"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Biblioteki"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Serwery"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminale"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Narzędzia tekstowe"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Zabawki"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Stacja robocza"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Narzędzia konsolowe"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacja"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Stacja rozrywkowa (gry)"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Stacja internetowa"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Stacja multimedialna"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Komputer sieciowy (klient)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Stacja biurowa"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Środowisko graficzne"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Stacja GNOME"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "Pulpit IceWM"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "Stacja KDE"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Inne środowiska graficzne"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Serwer"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Baza danych"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Zapora sieciowa/router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Serwer sieciowy"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Niedostępne)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Wyniki wyszukiwania"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Wyniki wyszukiwania (brak)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Proszę czekać, wyszukiwanie..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Dodawalne"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Zarządzanie oprogramowaniem"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr ""
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Aktualizacja możliwa"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Nie wybrane"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Dodawalne"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Wybrane"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Nie wybrane"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Ważność: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Przyczyna uaktualnienia: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Biuletyn bezpieczeństwa"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Brak opisu"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Plików:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Dziennik zmian:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Plików:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Dziennik zmian:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Nośnik: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Aktualnie zainstalowana wersja: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Wersja: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Architektura: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Rozmiar: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Podsumowanie: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Zarządzanie oprogramowaniem"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Więcej informacji o pakiecie..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Wymagany jest jeden z poniższych pakietów:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Proszę wybrać"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Wymagany jest jeden z poniższych pakietów:"
+msgstr[1] "Wymagany jest jeden z poniższych pakietów:"
+msgstr[2] "Wymagany jest jeden z poniższych pakietów:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Proszę czekać, wypisywanie pakietów..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Brak aktualizacji"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1182,35 +1534,42 @@ msgstr ""
 "dostępnych aktualizacji dla zainstalowanych pakietów lub też\n"
 "już zainstalowano wszystkie aktualizacje."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Wszystko"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Więcej info"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informacje o pakietach"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Zostanie usuniętych kilka dodatkowych pakietów"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr ""
 "Z powodu swoich zależności, poniższe pakiety także muszą zostać usunięte:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Nie można usunąć niektórych pakietów"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1218,7 +1577,8 @@ msgstr ""
 "Niestety, usunięcie tych pakietów może spowodować uszkodzenie systemu:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1228,11 +1588,13 @@ msgstr ""
 "teraz odznaczone:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Wymagane są dodatkowe pakiety"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1242,130 +1604,170 @@ msgstr ""
 "zostać zainstalowane:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (należy do listy pominięć)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Nie można zainstalować niektórych pakietów"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Nie można zainstalować niektórych pakietów"
+msgstr[1] "Nie można zainstalować niektórych pakietów"
+msgstr[2] "Nie można zainstalować niektórych pakietów"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Niestety, poniższe pakiety nie mogą zostać wybrane:\n"
+"\n"
+"%s"
+msgstr[1] ""
+"Niestety, poniższe pakiety nie mogą zostać wybrane:\n"
+"\n"
+"%s"
+msgstr[2] ""
 "Niestety, poniższe pakiety nie mogą zostać wybrane:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Niektóre pakiety muszą zostać usunięte"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Wybranych: %s / Miejsce na dysku: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Wybrany rozmiar: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Opis jest niedostępny dla tego pakietu\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Wystąpił poważny błąd: %s."
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Zainstalowany"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Nie zainstalowany"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "do wyboru %s"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Lista wyboru Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Wszystkie pakiety, alfabetycznie"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Wszystkie pakiety, według dostępności aktualizacji"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Wszystkie pakiety, według rozmiaru"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Wszystkie pakiety, według stanu zaznaczenia"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Tylko liście, uporządkowane według daty instalacji"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Wszystkie pakiety, według grupy"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Wszystkie aktualizacje"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Aktualizacje z dziedziny bezpieczeństwa"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Aktualizacje poprawiające błędy"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Zwykłe aktualizacje"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Aktualizacje z dziedziny bezpieczeństwa"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "w nazwach"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "w opisach"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "w nazwach plików"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 "Błąd: wygląda na to, że %s został zamontowany tylko w trybie do odczytu."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Należy najpierw wybrać jakieś pakiety."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Wybrano zbyt wiele pakietów"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1381,137 +1783,179 @@ msgstr ""
 "\n"
 "Czy naprawdę chcesz zainstalować wszystkie zaznaczone pakiety?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Plik"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Aktualizacja nośnika(-ów)"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Usuń zaznaczenie"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Przeładuj listę _pakietów"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Zakończ"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Opcje"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Menedżer nośników oprogramowania"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/P_okaż automatycznie wybrane pakiety"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Pomoc"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Zgłoś błąd"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/O _programie..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "O Rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 "Rpmdrake jest narzędziem do zarządzania oprogramowaniem w systemie Mandriva "
 "Linux."
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Imiona i adresy email tłumacza(y)\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Znajdź:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Wyszukaj"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Zaznacz wszystko"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Szybka prezentacja"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 "Pakiety można przeglądać z wykorzystaniem kategorii znajdujących się po "
 "lewej stronie."
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Informację na temat pakietu można uzyskać klikając na niego w oknie po "
 "prawej stronie."
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "Aby zainstalować, zaktualizować lub usunąć program wystarczy zaznaczyć "
 "\"checkbox\" obok jego nazwy."
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Poważny błąd"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Wystąpił poważny błąd: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Proszę czekać"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Instalacja pakietów..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Inicjalizacja..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Potwierdzenie"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1524,12 +1968,13 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Już istniejące nośniki aktualizacyjne"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1545,12 +1990,13 @@ msgstr ""
 "\n"
 "Następnie uruchom ponownie %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sposób ręcznego wyboru serwera zwierciadlanego"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1564,56 +2010,73 @@ msgstr ""
 "\n"
 "Potem należy ponownie uruchomić %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "w opisach"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Proszę czekać, wypisywanie pakietów..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Sprawdzanie %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "zmiany:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Usuń %s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Użyj .%s jako plik podstawowy"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Nic nie rób"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Instalacja zakończona"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Sprawdź..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Wszystkie żądane pakiety zostały pomyślnie zainstalowane."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Wystąpił problem podczas instalacji"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1623,17 +2086,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Nie można pobrać pakietów źródłowych."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Niestety, nie można pobrać pakietów źródłowych. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1645,67 +2109,93 @@ msgstr ""
 "Zgłoszono błąd(błędy):\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"W celu spełnienia zależności zostaną zainstalowane następujące %d pakiety  \n"
+"%s\n"
+msgstr[1] ""
+"W celu spełnienia zależności zostaną zainstalowane następujące %d pakiety  \n"
+"%s\n"
+msgstr[2] ""
 "W celu spełnienia zależności zostaną zainstalowane następujące %d pakiety  \n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Usuń klucz"
+msgstr[1] "Usuń klucz"
+msgstr[2] "Usuń klucz"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Poniższe pakiety muszą zostać usunięte aby zaktualizować inne:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Czy chcesz kontynuować?"
+msgstr[1] ""
+"Poniższe pakiety muszą zostać usunięte aby zaktualizować inne:\n"
+"\n"
+"%s\n"
+"\n"
+"Czy chcesz kontynuować?"
+msgstr[2] ""
 "Poniższe pakiety muszą zostać usunięte aby zaktualizować inne:\n"
 "\n"
 "%s\n"
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Inicjalizacja..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Instalacja pakietów..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Proszę czekać"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Czy chcesz kontynuować?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Zmień nośnik"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Wsuń nośnik oznaczony \"%s\" do urządzenia [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Pobieranie pakietu \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Weryfikowanie podpisów pakietów..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1719,12 +2209,13 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować instalację?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Instalacja zakończona niepowodzeniem"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1736,25 +2227,28 @@ msgstr ""
 "\n"
 "Może zachodzić potrzeba aktualizacji bazy danych nośników."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Przygotowywanie instalacji pakietów..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Przygotowywanie..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nie można uzyskać dostępu do pliku rpm [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1766,33 +2260,48 @@ msgstr ""
 "Pewne pliki konfiguracyjne zostały utworzone jako `.rpmnew' lub `.rpmsave',\n"
 "Można je sprawdzić aby podjąć odpowiednie działanie:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Te pakiety zawierają także informacje o uaktualnieniach"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Więcej informacji o pakiecie..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Więcej informacji o pakiecie... [%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Błąd"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Nierozpoznany błąd: nie znaleziono pakietu do instalacji, sorry."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Proszę czekać, usuwanie pakietów..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Problem podczas usuwania"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1802,11 +2311,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Witajcie"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1818,8 +2329,8 @@ msgstr ""
 "To narzędzie pomoże ci wybrać programy, które mogą zostać usunięte\n"
 "z komputera."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1831,11 +2342,13 @@ msgstr ""
 "To narzędzie pomoże ci wybrać aktualizacje, które możesz chcieć\n"
 "zainstalować na tym komputerze."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Witamy w programie instalacyjnym!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1849,172 +2362,213 @@ 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:102
-msgid "Mandriva Linux Update"
-msgstr "Aktualizacja Mandriva Linux"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Uaktualnianie pakietów oprogramowania"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Aktualizacja Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Aby uzyskać dostęp do proxy wprowadź dane uwierzytelniające\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Nazwa użytkownika:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Usuwanie pakietów oprogramowania"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Uaktualnianie pakietów oprogramowania"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Instalacja pakietów oprogramowania"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Nie"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Tak"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Informacja ..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brazylia"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Szwajcaria"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Kostaryka"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Czechy"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Niemcy"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Dania"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grecja"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Hiszpania"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Francja"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Węgry"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Włochy"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Holandia"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polska"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rosja"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Szwecja"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Słowacja"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Tajwan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Wielka Brytania"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Chiny"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Stany Zjednoczone"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2027,7 +2581,8 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2040,25 +2595,28 @@ msgstr ""
 "\n"
 "Czy chcesz kontynuować?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Wybór serwera lustrzanego"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Proszę czekać, pobieranie adresów serwerów zwierciadlanych."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Proszę czekać, pobieranie adresów serwerów zwierciadlanych."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Błąd podczas pobierania"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2073,7 +2631,7 @@ msgstr ""
 "Spróbuj później ponownie."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2088,14 +2646,17 @@ msgstr ""
 "Spróbuj później ponownie."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Brak serwerów zwierciadlanych"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Odnalezienie odpowiedniego serwera zwierciadlanego jest niemożliwe."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2110,63 +2671,68 @@ msgstr ""
 "Aktualizacje Pakietów Mandriva Linux."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Wybierz serwer zwierciadlany."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiowanie pliku dla nośnika \"%s\"..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Badanie pliku nośnika \"%s\"..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Badanie zdalnego pliku nośnika \"%s\"..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " gotowe."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " niepowodzenie!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s z nośnika %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Rozpoczynanie pobierania pakietu \"%s\"..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Pobieranie pakietu \"%s\", czas zakończenia:%s, szybkość:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Pobieranie pakietu \"%s\", szybkość:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Proszę czekać, aktualizacja nośnika..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Błąd podczas pobierania pakietów"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2181,31 +2747,31 @@ 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:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Aktualizacja nośnika(-ów)"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Nie odnaleziono aktywnego nośnika. Aby zaktualizować nośnik należy go "
 "aktywować."
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Wybierz nośnik(i) do aktualizacji:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Zaznacz wszystko"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2216,8 +2782,8 @@ msgstr ""
 "Błędy:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2227,16 +2793,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Nie można utworzyć nośnika."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Niepowodzenie podczas dodawania nośnika"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2246,8 +2814,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2257,8 +2825,8 @@ msgstr ""
 "używasz (%s).\n"
 "Zostanie on wyłączony."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2268,11 +2836,13 @@ msgstr ""
 "systemu Mandriva Linux (%s).\n"
 "Zostanie on wyłączony."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Pomoc uruchomiona w tle"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2547,3 +3117,6 @@ msgstr "Usuwanie oprogramowania"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "Menedżer nośników oprogramowania"
+
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Proszę czekać, odczytywanie bazy danych pakietów..."
diff --git a/po/ro.po b/po/ro.po
index c699c1fc..214aa122 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +27,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "sourceforge.net>\n"
 "X-Generator: KBabel 1.3.1\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -46,17 +49,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "Actualizări normale"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -72,87 +76,104 @@ msgstr ""
 "\n"
 "Pot să continui?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Vă rog să aşteptaţi, actualizez mediul..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Adaugă un mediu"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Fişiere locale"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Cale:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "Server FTP"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Server HTTP"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Calea sau punctul de montare:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Dispozitiv detaşabil"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Calea sau punctul de montare:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Răsfoieşte..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Logare:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Calea relativă la synthesis sau hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Nume:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "Selectaţi mediile de actualizat:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Trebuie să completaţi cel puţin primele două intrări."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -160,112 +181,132 @@ msgstr ""
 "Există deja un mediu cu acel nume,\n"
 "chiar doriţi să îl înlocuiţi?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Adaug un mediu:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Tipul mediului:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Pregătesc pachetele pentru instalare..."
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "zero"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Unele pachete nu pot fi instalate"
 
-#: ../edit-urpm-sources.pl:325
-#, fuzzy
+#: ../edit-urpm-sources.pl:334
+#, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "Descarc `%s', viteză: %s"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Ştergere surse"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-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:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Vă rog să aşteptaţi, şterg mediul..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Editare mediu"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Editez mediul \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Salvează schimbările"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Trebuie să introduceţi mediul pentru a continua"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Configurare proxy-uri"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Configurare proxy pentru mediul \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Configurări globale proxy"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -273,138 +314,172 @@ msgstr ""
 "Dacă e nevoie de proxy, introduceţi numele gazdei şi opţional un port "
 "(sintaxă: <gazdăproxy[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Nume gazdă proxy:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Utilizator:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Adaugă un grup paralel"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Editează un grup paralel"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Adaugă o limită pt. mediu"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Adaugă o gazdă"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editez grupul paralel \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Nume grup:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Limite mediu:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Adăugare"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Şterge"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Gazde:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Configurare urpmi paralel (execuţie distribuită a urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grup"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Limite mediu"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Limite mediu"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Comandă"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(nimic)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Editare..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Adaugă..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Administrare chei pentru semnarea digitală a pachetelor"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Mediu"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Adaugă o cheie"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Închide"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Elimină o cheie"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -412,33 +487,38 @@ msgstr ""
 "Sunteţi sigur că doriţi să eliminaţi cheia %s de pe mediul %s?\n"
 "(numele cheii: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Adaugă o cheie..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Elimină o cheie"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Configurare medii"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Activat?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Actualizare"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -448,34 +528,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Adaugă..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Actualizează..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Administrare chei..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../edit-urpm-sources.pl:1007
-#, fuzzy
+#: ../edit-urpm-sources.pl:1025
+#, fuzzy, c-format
 msgid "Global options..."
 msgstr "Configurări globale proxy"
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Ajutor"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -485,7 +569,8 @@ msgstr ""
 "\n"
 "Pot continua?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -501,7 +586,8 @@ msgstr ""
 "pentru \n"
 "instalare de soft nou sau actualizare."
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -513,12 +599,13 @@ msgstr ""
 "pachete pe alt desktop, sau instalaţi alte pachete în acelaşi\n"
 "timp?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Nu pot adăuga mediul, argumente greşite sau lipsă"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -528,8 +615,8 @@ msgstr ""
 "Aceasta înseamnă că veţi putea adăuga de pe acest mediu\n"
 " pachete cu program la sistemul dvs."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -539,80 +626,94 @@ msgstr ""
 "Aceasta înseamnă că veţi putea adăuga de pe acest mediu\n"
 " pachete cu program la sistemul dvs."
 
-#: ../gurpmi.addmedia:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "Mediul `%s' a fost adăugat cu succes."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Mediul `%s' a fost adăugat cu succes."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Utilizare: %s [OPŢIUNI]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Execuţie în mod utilizator"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -622,547 +723,786 @@ msgstr ""
 "Nu veţi putea modifica sistemul, dar veţi putea\n"
 "naviga prin baza de date existentă."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Accesibilitate"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arhivare"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Copii de siguranță"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Gravare de Cd-uri"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Comprimare"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Diverse"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Cărţi"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Carţi despre calculatoare"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Întrebări frecvente -FAQ's"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Cum să fac (HowTo)"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Literatură"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Schimb de mesaje"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Servicii de punere în coadă"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Telecomunicaţii"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Baze de date"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Dezvoltare"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME şi GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE şi Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Nucleu"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editoare"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Educaţie"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulatoare"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Unelte fișiere"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Jocuri"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Aventură"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Jocuri de acţiune"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Table"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Cărţi de joc"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Puzzles"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategie"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Ecran grafic"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "Bazat pe FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
-msgid "WindowMaker"
+#: ../rpmdrake:276
+#, c-format
+msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafică"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Monitorizare"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Reţea"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Transfer fişiere"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Mesagerie instantanee"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Poştă"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Ştiri"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Acces la distanţă"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Birou"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Chei publice"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publicare"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Științe"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomie"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologie"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Chimie"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Informatică"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Ştiinţe geo"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematică"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizică"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Interpretoare"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Sunet"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistem"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Bază"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Configurare"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Pornire și Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Echipamente"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Împachetare"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Imprimare"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Instalare"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Instalare"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Fonturi"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Consolă"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "bitmap X11"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internaţionalizare"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Nucleu şi echipamente"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Biblioteci"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Servere"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminale"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Unelte text"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Jucării"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Staţie de lucru"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Unelte consolă"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Documentaţie"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Staţie de lucru pt. jocuri"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Staţie de lucru în Internet"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Staţie de lucru multimedia"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Calculator în reţea (client)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Staţie de lucru de birou"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Staţie de lucru ştiinţifică"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Mediu Grafic"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Staţie de lucru Gnome"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Ecran"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "Staţie de lucru KDE"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Alte desktopuri grafice"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Server"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Baze de date"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Server în reţea"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Indisponibil)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Rezultatele căutării"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Rezultatele căutării (nimic)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Vă rog să aşteptaţi, caut..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Disponibile pt. adăugare"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Administrator surse de programe"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Opreşte"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Actualizabile"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Deselectat"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Disponibile pt. adăugare"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Selectate"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Deselectat"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Importanţă: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Motivul actualizării:"
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Actualizări ale sistemului de securitate"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Nici o descriere"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Fişiere:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Jurnal schimbări:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Fişiere:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Jurnal schimbări:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Mediu:"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Versiunea instalată curent:"
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Nume: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versiune: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Mărime: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Sumar: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Descriere:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Administrator surse de programe"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Mai multe informaţii despre pachet..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Este necesar unul din următoarele pachete:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Vă rog să alegeţi"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Este necesar unul din următoarele pachete:"
+msgstr[1] "Este necesar unul din următoarele pachete:"
+msgstr[2] "Este necesar unul din următoarele pachete:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Vă rog să aşteptaţi, listez pachetele..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Nu sunt actualizări"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1172,35 +1512,42 @@ msgstr ""
 "actualizări disponibile pentru pachetele instalate pe calculatorul dvs.,\n"
 "sau că le-aţi instalat deja pe toate."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Toate"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Mai multe informaţii"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informaţii despre pachete"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Trebuie şterse unele pachete adiţionale"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr ""
 "Datorită dependenţelor lor, următoarele pachete trebuie de asemenea şterse:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Unele pachete nu pot fi şterse"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1208,7 +1555,8 @@ msgstr ""
 "Ştergerea acestor pachete ar corupe sistemul, îmi pare rău:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1218,11 +1566,13 @@ msgstr ""
 "deselectate acum:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Pachete adiţionale necesare"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1232,132 +1582,169 @@ msgstr ""
 "trebuie de asemenea instalate\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (este în lista de excluderi)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Unele pachete nu pot fi instalate"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Unele pachete nu pot fi instalate"
+msgstr[1] "Unele pachete nu pot fi instalate"
+msgstr[2] "Unele pachete nu pot fi instalate"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Regret, următoarele pachete nu pot fi selectate:\n"
+"\n"
+"%s"
+msgstr[1] ""
+"Regret, următoarele pachete nu pot fi selectate:\n"
+"\n"
+"%s"
+msgstr[2] ""
 "Regret, următoarele pachete nu pot fi selectate:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Unele pachete trebuie şterse"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Selectat: %s / Spaţiu liber pe disc: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Mărime selecţie: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Descrierea nu este disponibilă pentru acest pachet\n"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "A apărut o eroare fatală: %s."
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Instalează"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Instalează"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Opţiuni Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Toate pachetele, alfabetic"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Toate pachetele, după disponibilitatea actualizării"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Toate pachetele, după mărime"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Toate pachetele, după starea selecţiei"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Numai ramuri, după data instalării"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Toate pachetele, după grup"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Actualizări normale"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Actualizări ale sistemului de securitate"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Actualizări pentru corectarea erorilor"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Actualizări normale"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Actualizări ale sistemului de securitate"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "în nume"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "în descrieri"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "în numele fişierelor"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Întâi selectaţi nişte pachete."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Sunt selectate prea multe pachete"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1373,133 +1760,171 @@ msgstr ""
 "\n"
 "Chiar doriţi să instalaţi pachetele selectate?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Fişier"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Actualizare medii"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Resetează selecţia"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Reîncarcă lista _pachetelor"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Terminare"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Opţiuni"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Administrator surse de programe"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Arată pachetele selectate automat"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/A_jutor"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Raportare eroare"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/Despre..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Caută:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Căutare"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Şterge"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, fuzzy, c-format
+msgid "Select all"
+msgstr "Selectate"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Aplică"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Ieşire"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Eroare fatală"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "A apărut o eroare fatală: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Vă rog să aşteptaţi"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Instalare pachete..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Iniţializez..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "Configurare LAN"
+msgstr "Configuraţie"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1512,12 +1937,13 @@ msgstr ""
 "\n"
 "Doriţi să continuaţi?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Mediu de actualizare preexistent"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1533,12 +1959,13 @@ msgstr ""
 "\n"
 "Apoi reporniţi %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Cum să selectaţi manual serverul oglindă"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1552,56 +1979,73 @@ msgstr ""
 "\n"
 "Apoi reporniţi %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "în descrieri"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vă rog să aşteptaţi, caut pachetele disponibile..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Vă rog să aşteptaţi, citesc baza de date a pachetelelor..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Vă rog să aşteptaţi, listez pachetele..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Vă rog să aşteptaţi, caut pachetele disponibile..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Inspectez %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "schimbări:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Şterg .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Foloseşte .%s ca fişier principal"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Nu fă nimic"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Instalare terminată"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Inspectez..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Toate pachetele cerute au fost instalate cu succes."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Probleme apărute în timpul instalării"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1611,17 +2055,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Nu pot prelua pachetele sursă."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Nu pot prelua pachetele sursă, regret. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1633,67 +2078,93 @@ msgstr ""
 "Eroare(erori) raportată(e):\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Pentru a satisface dependenţele, următoarele %d pachete vor fi instalate (% "
+"d MB)"
+msgstr[1] ""
+"Pentru a satisface dependenţele, următoarele %d pachete vor fi instalate (% "
+"d MB)"
+msgstr[2] ""
 "Pentru a satisface dependenţele, următoarele %d pachete vor fi instalate (% "
 "d MB)"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Elimină o cheie"
+msgstr[1] "Elimină o cheie"
+msgstr[2] "Elimină o cheie"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Următoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Doriţi să continuaţi? "
+msgstr[1] ""
+"Următoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
+"\n"
+"%s\n"
+"\n"
+"Doriţi să continuaţi? "
+msgstr[2] ""
 "Următoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
 "\n"
 "%s\n"
 "\n"
 "Doriţi să continuaţi? "
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Iniţializez..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Instalare pachete..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Vă rog să aşteptaţi"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Pot continua?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Schimbă mediul"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vă rog să introduceţi mediul numit \"%s\" în dispozitivul [%s] "
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Descarc pachetul `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Verific semnăturile pachetelor..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Avertisment"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1707,12 +2178,13 @@ msgstr ""
 "\n"
 "Doriţi să continuaţi?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Instalare eşuată"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1724,26 +2196,28 @@ msgstr ""
 "\n"
 "Probabil ar trebui să actualizaţi baza de date a mediilor sursă."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Pregătesc pachetele pentru instalare..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Pregătire..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalez pachetul `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "nu pot accesa fişierul rpm [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1755,33 +2229,48 @@ 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:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Informaţii normale"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Aceste pachete conţin informaţii de actualizare"
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
 msgstr "Mai multe informaţii despre pachet..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
+msgstr "Mai multe informaţii despre pachet..."
+
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Eroare"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Eroare, nu am găsit nici un pachet pt. instalare, regret."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Vă rog să aşteptaţi, şterg pachetele..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Problemă în timpul ştergerii"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1791,11 +2280,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Bun venit"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1807,8 +2298,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:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1821,11 +2312,13 @@ msgstr ""
 "care doriţi \n"
 "să le actualizaţi ."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1840,176 +2333,213 @@ msgstr ""
 "Acest utilitar vă va ajuta să alegeţi programele pe care doriţi \n"
 "să le instalaţi pe calculatorul dvs."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Actualizare Mandriva Linux"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "Actualizare pachete software"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Actualizare Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Vă rog să introduceţi mai jos adresa dvs. de email "
 
-#: ../rpmdrake.pm:130
-#, fuzzy
+#: ../rpmdrake.pm:132
+#, fuzzy, c-format
 msgid "User name:"
 msgstr "Nume:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Ştergere pachete Software"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Actualizare pachete software"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Instalare pachete cu programe..."
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Nu"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Informaţii... "
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brazilia"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Elveţia"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Cehia"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Germania"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danemarca"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Spania"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlanda"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Franţa"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Ungaria"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Coreea"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Olanda"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovacia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Marea Britanie"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "China"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Statele Unite"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2022,7 +2552,8 @@ msgstr ""
 "\n"
 "Pot să continui?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2035,30 +2566,32 @@ msgstr ""
 "\n"
 "Pot să continui?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Vă rog să aşteptaţi, descarc adresele serverelor oglindă de pe situl "
 "Mandriva."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 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."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Eroare în timpul descărcării."
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2073,7 +2606,7 @@ msgstr ""
 "Vă rog să încercaţi din nou mai târziu."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2088,14 +2621,17 @@ msgstr ""
 "Vă rog să încercaţi din nou mai târziu."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Nu există servere oglindă"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2110,63 +2646,68 @@ msgstr ""
 "de actualizările oficiale Mandriva Linux."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Vă rog să selectaţi serverul oglindă dorit."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Copiez fişierul pentru mediul `%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Examinez fişierul pentru mediul `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Examinez fişierul la distanţă pentru mediul `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " terminat."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " Eşec!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s de pe mediul %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Pornesc descărcarea pt: `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Descarc `%s', timp rămas: %s, viteză: %s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Descarc `%s', viteză: %s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Vă rog să aşteptaţi, actualizez mediul..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Eroare la aducerea pachetelor"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2183,30 +2724,29 @@ msgstr ""
 "iarăsi\n"
 "mai târziu."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Actualizare mediu"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Selectaţi mediile de actualizat:"
 
 #: ../rpmdrake.pm:764
-#, fuzzy
-msgid "Select all"
-msgstr "Selectate"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Actualizare"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2218,8 +2758,8 @@ msgstr ""
 "Erori:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2229,16 +2769,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Nu pot creea mediul."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Adăugare mediu eşuată"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2248,8 +2790,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:850
+#, fuzzy, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2259,8 +2801,8 @@ msgstr ""
 "versiunea de Mandriva Linux pe care o rulaţi (%s).\n"
 "Va fi dezactivat."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2270,11 +2812,13 @@ msgstr ""
 "versiunea de Mandriva Linux pe care o rulaţi (%s).\n"
 "Va fi dezactivat."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Ajutorul a fost lansat în fundal"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 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."
@@ -2549,21 +3093,22 @@ msgstr "Ştergere programe"
 msgid "Software Media Manager"
 msgstr "Administrator surse de programe"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Vă rog să aşteptaţi, citesc baza de date a pachetelelor..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Nu am gasit nici un pachet de instalat."
 
-#~ 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"
 
@@ -2585,9 +3130,6 @@ msgstr "Administrator surse de programe"
 #~ msgid "Keys"
 #~ msgstr "Chei"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/_Vizualizare"
 
diff --git a/po/sq.po b/po/sq.po
index b344c8ad..ac100c65 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,19 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2002-11-27 21:45:+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf>\n"
 "Language-Team: Albanian <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -33,17 +36,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "Azhurnimet normale"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -59,88 +63,105 @@ msgstr ""
 "\n"
 "A pajtoheni për të vazhduar?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Një moment ju lutemi, azhurnimi i burimeve..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Shtoje një burim"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Skedaret lokale"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Shtegu:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Serveri FTP"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "Serveri FTP"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Serveri HTTP"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Shtegu apo pika montuese:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Mjet i lëvizshëm"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Shtegu apo pika montuese:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Shfletues..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Parulla:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Shtegu që ka të bëjë me synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Emri:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "Zgjedhni burimin të cilin dëshironi t'azhurnoni:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -148,117 +169,136 @@ 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
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Shtimi i një burimi:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Tip i burimit:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Anulo"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Pregatitje për instalimin e pakove..."
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "asnjëherë"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Disa nga pakot nuk mund të instalohen"
 
-#: ../edit-urpm-sources.pl:325
-#, fuzzy
+#: ../edit-urpm-sources.pl:334
+#, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "Shkarkimi i `%s', shpejtësia:%s"
 
-#: ../edit-urpm-sources.pl:355
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "Zhdukja e Pakove Software"
 
-#: ../edit-urpm-sources.pl:356
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:365
+#, fuzzy, c-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:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Një moment ju lutemi, zhdukja e burimit..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Botoje një burim"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Botimi i burimit \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Shpëtoi ndryshimet"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, 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:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr ""
 "Më në fund për ti regjistruar ndryshimet, ju duhet ta futni burimin në "
 "lexues."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Konfigurimi i proxies"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -266,140 +306,174 @@ msgstr ""
 "Nëse keni nevojë për proxy, futni emrin e makinës dhe të portës zgjedhëse"
 "(sintaksa është:<emri-i-makinës[:porta]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Emri i serverit proxy:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Përdoruesi:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Shtoje një grup paralel"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Botoje grupin paralel"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Shtoni një burim të kufizuar"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Shtimi i një ftuesi"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Botimi i grupit paralel \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Emri i grupit:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokoli:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Burim i kufizuar:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Shtoje"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Zhduke"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Ftuesit:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, 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:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grupi"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Medi e kufizuar"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokoli"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Medi e kufizuar"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Urdhër"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(asnjë)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Botues..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Shtoje..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, 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:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Burimi"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Shtoje një çelës"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Mbylle"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Zhduke çelësin"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -407,66 +481,76 @@ 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:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Shtoje një çelës..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Zhduke çelësin"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Konfiguroje burimin"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Aktivizuar?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Azhurnimi"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Shtoje..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Azhurnimi..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Menagjimi i çelësave..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paralel..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Ndihmë"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -476,7 +560,8 @@ msgstr ""
 "\n"
 "A pajtoheni për të vazhduar?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -490,7 +575,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -498,100 +584,115 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Përdorim: %s [OPCIONI...]"
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Nisje në mod të përdoruesit"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -601,549 +702,785 @@ 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Mundësi për hyrje"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arkivimi"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Regjitrim"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Cd gdhendësi"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Compresim"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Tjetri"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Librat"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Libra për kompjuter"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Faqs"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Komunikimet"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Bazë e të dhënave"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Zhvillimi"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME dhe GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE dhe Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Bërthama"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Botuesit"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Edukim"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Imituesit"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Vegla skedaresh"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Lojërat"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Aventurë"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Boards"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Letrat"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Enigmat"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sportet"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategji"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Tryezë Grafike"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Ndriçimi"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM i bazuar"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafike"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Vështrimi"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Punimi i rrjetit"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Transferoje skedaren"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Lajmërim i çastit"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Mail"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Lajmet"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Hyrje të largëta"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Zyre"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publikimi"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Shkencat"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomia"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologjia"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Kimia"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Shkencë kompjuterike"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Gjeoshkencore"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematikët"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizikët"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shellet"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Zëri"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistemi"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Bazuar"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Konfigurim"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Boot dhe Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Paketim"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Stampimi"
 
-#: ../rpmdrake:300
-#, fuzzy
+#: ../rpmdrake:317
+#, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Ndërtimi"
 
-#: ../rpmdrake:301
-#, fuzzy
+#: ../rpmdrake:318
+#, fuzzy, c-format
 msgid "Deployment"
 msgstr "Ndërtimi"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Polisat"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Kosnola"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "Tip i vërtet"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Tip1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internacionalizimi"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Bërthama dhe hardveri"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Bibliotekat"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Serverët"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminalet"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Vegla teksti"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Lodrat"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Stacion punues"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Vegla në konsolë"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacioni"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Stacion Lojërash"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Stacion Interneti"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Stacion Multimedia"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Kompjuter Rrjeti (klient)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Stacioni Punues në Tryezë"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Stacioni Punues Shkencor"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Mjedis Grafikë"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Stacioni punues Gnome"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Tryeza"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "Stacioni punues KDE"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Mjedise të Tjera Grafike në Tryezë"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Server"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Bazë e të dhënave"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Murë-i-Zjarrtë/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Server Kompjuter Rrjeti"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(I nxënë)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Kërkues i rezultateve"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Rezultatet e hetimeve (asnjë)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Një moment, hetimet në vazhdim e sipër..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Të reja"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Menagjues i Burimit Softver"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Ndale"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Azhurnuar"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "I pa zgjedhur"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Të reja"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Zgjedhur"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "I pa zgjedhur"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Rëndësia: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Arësyja për azhurnim: "
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Azhurnimet e sigurisë"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Asnjë përshkrim"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Skedaret:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Changelog:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Skedaret:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Burimi: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Versioni i tanishëm i instaluar: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Emri: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Versioni: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Madhësia: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Titulli: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Përshkrimi: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Menagjues i Burimit Softver"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Më shumë informacione mbi pakon..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Një nga pakot vijuese është e nevojshme:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Ju lutemi zgjedheni"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Një nga pakot vijuese është e nevojshme:"
+msgstr[1] "Një nga pakot vijuese është e nevojshme:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Një moment ju lutemi, numërimi i pakove..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Asnjë azhurnim"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1153,35 +1490,42 @@ msgstr ""
 "asnjë nga pakot e instaluara, nuk janë azhurnuar në kompjuterin tuaj\n"
 "ose ju i keni instaluar më heret ato."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Gjitha"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Më shumë informacione"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informacion mbi pakon"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Disa nga pakot e mbledhura duhet të zhduken"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr ""
 "Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të zhduken:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Disa nga pakot nuk mund të zhduken"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1189,7 +1533,8 @@ msgstr ""
 "Zhdukja e këtyre pakove do të dëmtojë sistemin tuaj, kemi ndjesë:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1199,11 +1544,13 @@ msgstr ""
 "tani:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Keni nevojë për pakot shtuese"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1213,127 +1560,164 @@ msgstr ""
 "instalohen:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Disa nga pakot nuk mund të instalohen"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Disa nga pakot nuk mund të instalohen"
+msgstr[1] "Disa nga pakot nuk mund të instalohen"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Kemi ndjesë, pako(t) e radhitur(a) nuk mundë të zgjedhe(n):\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Kemi ndjesë, pako(t) e radhitur(a) nuk mundë të zgjedhe(n):\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Disa pako duhet të zhduken"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Zgjedhur: %s / Hapësirë e lirë në disk: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Madhësia e zgjedhur: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Një gabim fatal është paraqitur: %s."
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Instaloje"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Instaloje"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mundësit Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Gjitha pakot, të radhitura simbas alfabetit"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Gjitha pakot, simbas azhurnimit janë të lira"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Gjitha pakot, simbas madhësisë"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Gjitha pakot, e zgjedhura simbas gjendjes së tyre"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Vetëm lejimet, të renditura simbas datës së instalimit"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Gjitha pakot, simbas grupit"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Azhurnimet normale"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Azhurnimet e sigurisë"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Korigjimi i bug(it) azhurnues"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Azhurnimet normale"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Azhurnimet e sigurisë"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "mes emrave"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "mes përshkrimeve"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "mes emrave të skedareve"
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1275
+#, c-format
+msgid "Error: %s appears to be mounted read-only."
+msgstr ""
+
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Ju duhet ti zgjedhni disa pako në fillim."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Numër shumë i madhë i pakove të zgjedhura"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1349,133 +1733,171 @@ msgstr ""
 "\n"
 "A me të vërtetë dëshironi t'instaloni të gjitha pakot e zgjedhura?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Skedare"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Azhurnim i burimit"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Vërja e zgjedhjeve në fillim"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Ringarkoje listën e pakove"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Braktise"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Opcionet"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Menagjues i Burimit Softver"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Paraqiti automatikisht pakot e zgjedhura"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Ndihmë"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Raport Bug(i)"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Në lidhje me..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Gjej:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Hulumto"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Pastro"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, fuzzy, c-format
+msgid "Select all"
+msgstr "Zgjedhur"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Aplikoje"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Braktise"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Gabim fatal"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Një gabim fatal është paraqitur: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Një moment ju lutemi"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Instalimi i pakos..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Inicializimi..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "Konfigurimi LAN"
+msgstr "Konfigurimi"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1487,12 +1909,13 @@ msgstr ""
 "\n"
 "A dëshironi të vazhdoni?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Burimet azhurnuese veqse ekzistojnë"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1508,12 +1931,13 @@ msgstr ""
 "\n"
 "Dhe, riniseni %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Si ta zgjedhni pasqyrën tuaj vetë"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1527,56 +1951,73 @@ msgstr ""
 "\n"
 "Dhe, riniseni %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "mes përshkrimeve"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Një moment ju lutemi, leximi në pakot e bazës së të dhënave..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Një moment ju lutemi, numërimi i pakove..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Inspektimi i %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "ndryshimet:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Zhduke .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Përdore .%s si skedare kryesore"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Asnjë veprim"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Instalimi përfundoi"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Inspektim..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Të gjitha pakot e zgjedhura janë instaluar si duhet."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Një problem është paraqitur gjatë instalimit"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1586,17 +2027,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "E pa mundur marrja e burimeve mbi pakot."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "E pa mundur marrja e burimeve mbi pakot, kemi ndjesë. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1608,26 +2050,45 @@ msgstr ""
 "Gabim(et) i(e) raportuar(a):\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të\n"
+"instalohen:\n"
+"\n"
+msgstr[1] ""
 "Me rastin e mbushjes së mvarësisë, pako(t) e radhitura duhet të\n"
 "instalohen:\n"
 "\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Zhduke çelësin"
+msgstr[1] "Zhduke çelësin"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Pakot e radhitura, duhet të zhduken që të tjerat të azhurnohen:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"\n"
+"A dëshironi të vazhdoni?"
+msgstr[1] ""
 "Pakot e radhitura, duhet të zhduken që të tjerat të azhurnohen:\n"
 "\n"
 "%s\n"
@@ -1635,42 +2096,41 @@ msgstr ""
 "\n"
 "A dëshironi të vazhdoni?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Inicializimi..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Instalimi i pakos..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Një moment ju lutemi"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"A pajtoheni për të vazhduar?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Ndrryshim i burimit"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ju lutemi futni emrin e burimit \"%s\" në mjetin [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Shkarkimi i pakos `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Verifikimi i nënshkrimeve të pakove..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Kujdes"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1684,12 +2144,13 @@ msgstr ""
 "\n"
 "A dëshironi të vazhdoni?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Instalimi dështoi"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1701,26 +2162,28 @@ msgstr ""
 "\n"
 "A dëshironi ti azhurnoni burimet e bazës së të dhënave."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Pregatitje për instalimin e pakove..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Përgatitje..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalimi i pakos `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "e pa mundur hyrja në skedaren rpm [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1732,33 +2195,48 @@ 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:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Infomacion normale"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Më shumë informacione mbi pakon..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Më shumë informacione mbi pakon..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Gabim"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gabim i pa mbuluar: asnjë pako e gjetur për instalim, kemi ndjesë."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Një moment ju lutemi, zhdukja pakove..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Një problem është paraqitur gjatë zhdukjes"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1768,11 +2246,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Mirësevini"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1784,8 +2264,8 @@ msgstr ""
 "Kjo vegël do të ju ndihmojë në zhdukjen e softverëve të dëshiruar nga "
 "kompjuteri juaj."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1797,11 +2277,13 @@ msgstr ""
 "Kjo vegël do të ju ndihmojë për intalimin e azhurnimeve të zgjedhura në\n"
 "kompjuterit tuaj."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1816,176 +2298,213 @@ msgstr ""
 "cilin\n"
 "sofver dëshironi ta instaloni në kompjuterin tuaj."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Azhurnimi Mandriva Linux"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "Zhdukja e Pakove Software"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Azhurnimi Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Ju lutemi futni adresën tuaj e-mail këtu"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Emri i përdoruesit:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Zhdukja e Pakove Software"
 
-#: ../rpmdrake.pm:174
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "Zhdukja e Pakove Software"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Instalimi i Pakove Software"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Jo"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Po"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Infomacion..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgjika"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brazili"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Zvicërra"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Republika Çeke"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Gjermania"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Greqia"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Spanja"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlanda"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Franca"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Hungaria"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Izraeli"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norvegjia"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapurit"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Sllovakia"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taivani"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Britania e Madhe"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Shtetet e Bashkuara"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1998,7 +2517,8 @@ msgstr ""
 "\n"
 "A pajtoheni për të vazhduar?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2011,30 +2531,32 @@ msgstr ""
 "\n"
 "A pajtoheni për të vazhduar?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Një moment ju lutemi, shkarkimi i adresave të pasqyreve nga web siti "
 "Mandriva."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Një moment ju lutemi, shkarkimi i adresave të pasqyreve nga web siti "
 "Mandriva."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Gabim gjatë shkarkimit"
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2049,7 +2571,7 @@ msgstr ""
 "Ju lutemi provoni më vonë."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2064,14 +2586,17 @@ msgstr ""
 "Ju lutemi provoni më vonë."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Asnjë pasqyre"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2086,63 +2611,68 @@ msgstr ""
 "përkrahet nga Azhurnimi i Mandriva Linux Zyrëtar"
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Zgjedheni pasqyrën tuaj."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopjimi i skedares për burimin `%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Verifikimi i skedarës së burimit `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Verifikimi i skedarës së largët të burimit `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " bërë."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " dështoi!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s për burimin %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Nisja e shkarkimit të `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Shkarkimi i `%s', koha e kaluar:%s, shpejtësia:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Shkarkimi i `%s', shpejtësia:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Një moment ju lutemi, azhurnimi i burimeve..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2152,30 +2682,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Azhurnim i burimit"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Zgjedhni burimin të cilin dëshironi t'azhurnoni:"
 
 #: ../rpmdrake.pm:764
-#, fuzzy
-msgid "Select all"
-msgstr "Zgjedhur"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Azhurnimi"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2187,25 +2716,26 @@ msgstr ""
 "Gabimet:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "I pa mundur krijimi i burimit."
 
-#: ../rpmdrake.pm:840
-#, fuzzy
+#: ../rpmdrake.pm:836
+#, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Një moment ju lutemi, shtimi i një burimi..."
 
-#: ../rpmdrake.pm:841
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:837
+#, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2215,27 +2745,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Ndihma është ngarkuar në ekranin e prapaskenës"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2511,21 +3043,22 @@ msgstr "Zhduke Softverin"
 msgid "Software Media Manager"
 msgstr "Menagjues i Burimit Softver"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Një moment ju lutemi, leximi në pakot e bazës së të dhënave..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Asnjë pako s'është gjetur për Instalim"
 
-#~ 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"
 
@@ -2547,9 +3080,6 @@ msgstr "Menagjues i Burimit Softver"
 #~ msgid "Keys"
 #~ msgstr "Çelësat"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/_Paraqitja"
 
@@ -2631,9 +3161,6 @@ msgstr "Menagjues i Burimit Softver"
 #~ msgid "Graphical desktop/Sawfish"
 #~ msgstr "Tryezë grafike/Sawfish"
 
-#~ msgid "Graphical desktop/Enlightenment"
-#~ msgstr "Tryezë grafike/Enlightenment"
-
 #~ msgid "Archiving/Backup"
 #~ msgstr "Arkivimi/Regjistrim"
 
diff --git a/po/sr.po b/po/sr.po
index c6ff2be5..0800824f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +20,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -39,17 +42,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "Обичне надоградње"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -64,87 +68,104 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Молим Вас сачекајте, ажурирам медијум..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Додај медиј"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Локални фајлови"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Путања:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP сервер"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP сервер"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP сервер"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Путања или тачка монтирања:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Преносни уређај"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Путања или тачка монтирања:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Тражи..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Пријава:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Релативна путања ка synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "уколико оставите празно, synthesis/hdlist ће бити аутоматски тестирана"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Име:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "Изаберите медиј који желите да ажурирате:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Морате да попуните најмање прва два поља."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -152,115 +173,134 @@ msgstr ""
 "Веќ постоји медиј са тим именом, да ли\n"
 "заиста желите да је замените?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Додајем медиј:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Тип медија:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Одустани"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "У реду"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Припремам инсталацију пакета"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "увек"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "никад"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Неки пакети не могу да се инсталирају"
 
-#: ../edit-urpm-sources.pl:325
-#, fuzzy
+#: ../edit-urpm-sources.pl:334
+#, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "Download са `%s', брзина:%s"
 
-#: ../edit-urpm-sources.pl:355
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "Уклањање пакета"
 
-#: ../edit-urpm-sources.pl:356
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:365
+#, fuzzy, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 "Да ли сте сигурни да желите да уклоните кључ %s са медија %s?\n"
 "(име кључа: %s)"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Молимо Вас да сачекате, уклањам медијум..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Измени медиј"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Мењам медиј \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Сачувај измене"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Прокси..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Морате да убаците медијум како би сте наставили"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Да би сте сачували измене, морате да убаците медијум у уређај."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Подешавање проксија"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -268,138 +308,172 @@ msgstr ""
 "Ако Вам је потребна прокси, унесите име домаћина и необавезни порт "
 "(синтакса: <proksi-domacin[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Име прокси домаћина(hostname):"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Можете да подесите корисника/лозинку за идентификацију проксија:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Корисник:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Доај паралелну групу"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Уредите паралелну групу"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Додај лимит за медиј"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Изаберите медиј за додавање у лимит за медије:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Додај host"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Унесите у име хоста или  IP адресу хоста за додавање:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Измени паралелну групу \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Име групе:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Лимит медија:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Додај"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Уклони"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Hosts:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Подесите паралелни urpmi (дистрибуирано покретање urpmi-ја)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Група"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Лимит за медије"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Лимит за медије"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(ниједан)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
-msgstr "Измени"
+msgstr "Измени..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Додај..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Управља кључевима за дигиталне потписе пакета"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Медиј"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "име није пронађено, кључ не постоји у rpm keyring!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Додај кључ"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Изабери кљул који треба додати медијуму %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Затвори"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Уклони кључ"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -407,66 +481,76 @@ msgstr ""
 "Да ли сте сигурни да желите да уклоните кључ %s са медија %s?\n"
 "(име кључа: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Додај кључ..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Уклони кључ"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Подешавање медија"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Укључи?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Ажурирање"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Додај..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Ажурирај..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Уреди кључеве..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Паралелно..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -476,7 +560,8 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -491,7 +576,8 @@ msgstr ""
 "на вашем рачунару. Након тога ће бити спреми за инсталацију као нови пакети\n"
 "или за ажурирање старих."
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -499,100 +585,115 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Употреба: %s [ОПЦИЈА]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Покренуто у корисничком моду"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -602,547 +703,786 @@ msgstr ""
 "Нећете бити у могућности да извршите модификације на систему,\n"
 "али можете да претражујете постојеће базе података."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Доступност"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Архивирање"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Нарезивање дискова"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Комресија"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Остало"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Књиге"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Рачунарске књиге"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Често постављана питања"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Упуства"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Литература"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Комуникације"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Базе података"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Развој"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME и GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Јава"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE и Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Кернел"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Перл"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Едитори"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Учење"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Емулатори"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Алати за фајлове"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Игрице"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Авантура"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Аркаде"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Форуми"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Карте"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Укрштенице"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Спортови"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Стратегија"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Графички десктоп"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "базирано на FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Мониторинг"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Мултимедија"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Мрежа"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Трансфер фајлова"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Инстант поруке"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Вести"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Удаљени приступ"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Канцеларија"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Публиковање"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Науке"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Астрономија"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Биологија"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Хемија"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Наука о рачунарима"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Природне науке"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Шелови"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Звук"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Систем"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Основно"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Подешавање"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Boot и Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Хардвер"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Паковање"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Штампање"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Искориштење"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Искориштење"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Фонтови"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Конзола"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Интернационализација"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Кернел и хардвер"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Библиотеке"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Сервери"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Терминали"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Алати за текст"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Играчке"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Радна станица"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Конзолни алати"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Документација"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Станица за игру"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Интернет станица"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Мултимедијална станица"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Мрежни компјутер, (клијент)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Радна(Office) станица"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Научна радна станица"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Графичко Окружење"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Gnome радна станица"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Десктоп"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE падна станица"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Други графички десктопови"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Сервер"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Сервер,Базе података"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Сервер, Firewall/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Мрежни Сервер"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Сервер, Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Није доступно)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Резултати претраге"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Резултат претраге (нема)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Молим Вас сачекајте, тражим..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Могу се додати"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Менаџер за Медије са софтвером"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Стоп"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Могу се ажурирати"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Нису изабрани"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Могу се додати"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Изабрани"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Нису изабрани"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Важност: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Разлог ажурирања:"
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Сигурносне надоградње"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Без описа"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Фајлови:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Измене:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Фајлови:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Измене:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Медиј: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Тренутно инсталирана верзија: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Име: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Верзија: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Величина: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Сажетак: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Опис:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Менаџер за Медије са софтвером"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Додатне информације о пакету..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Један од следећих пакета је потребан:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Изаберите"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Један од следећих пакета је потребан:"
+msgstr[1] "Један од следећих пакета је потребан:"
+msgstr[2] "Један од следећих пакета је потребан:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Молим Вас сачекајте, приказујем пакете..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Без ажурирања"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1153,24 +1493,29 @@ msgstr ""
 "пакета за ажурирање за ваш рачунар,\n"
 "или су они веќ инсталирани."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Све"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Још информација"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Информације о пакетима"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Још неки пакети морају бити уклоњени"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1178,11 +1523,13 @@ msgstr ""
 "Да би задовољили све зависности,следећи пакет(и) би такође требало да се "
 "уклоне:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Неки пакети се не могу уклонити"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1190,7 +1537,8 @@ msgstr ""
 "Жалим, али уклањањем ових пакета би сте оштетити систем:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1200,11 +1548,13 @@ msgstr ""
 "да буду неизабрани:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Потребни су додатни пакети"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1214,132 +1564,169 @@ msgstr ""
 "да се инсталирају:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Неки пакети не могу да се инсталирају"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Неки пакети не могу да се инсталирају"
+msgstr[1] "Неки пакети не могу да се инсталирају"
+msgstr[2] "Неки пакети не могу да се инсталирају"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Жалим, али  следећи пакет(и)не могу да буду изабрани:\n"
+"\n"
+"%s"
+msgstr[1] ""
+"Жалим, али  следећи пакет(и)не могу да буду изабрани:\n"
+"\n"
+"%s"
+msgstr[2] ""
 "Жалим, али  следећи пакет(и)не могу да буду изабрани:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Неки пакети морају да се уклоне"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Изабрано: %s / Слободан простор на диску: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Величина изабраног: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Појавила се фатална грешка: %s."
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Инсталирај"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Инсталирај"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-ов избор"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Сви пакети, по абецеди"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Сви пакети, по доступности нове верзије"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Сви пакети, по величини"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Сви пакети, по стању бирања"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "сортирани по датуму инсталације"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Сви пакети, по групи"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Обичне надоградње"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Сигурносне надоградње"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Надоградње са исправкама"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Обичне надоградње"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Сигурносне надоградње"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "у именима"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "у описима"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "у именима фајлова"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Прво морате да одаберете неке пакете."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Изабрали сте превише пакета"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1355,133 +1742,171 @@ msgstr ""
 "\n"
 "Да ли заиста желите да инсталирате изабране пакете?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Фајл"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Ажурирање медиј"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Поново изабери"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/П_оново учитај листу пакета"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Крај"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Опције"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Менаџер за Медије са софтвером"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Аутоматски прикажи изабране пакете"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Помоћ"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Пријавите Баг"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_О..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Toma Jankovic <tomaja@net.yu>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Пронађи:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Тражи"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Очисти"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Изабери све"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Промени"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Крај"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Фатална грешка"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Појавила се фатална грешка: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Само моменат..."
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Инсталација пакета..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Инициялизация..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "LAN конфигурација"
+msgstr "Конфигурација"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1493,12 +1918,13 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Већ постојићи медиј за ажурирање"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1515,12 +1941,13 @@ msgstr ""
 "\n"
 "Затим  рестартујте  %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Како ручно изабрати свој мирор сајт"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1534,56 +1961,73 @@ msgstr ""
 "\n"
 "Затим, рестарујте %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "у описима"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Молим Вас сачекајте, проналазим доступне пакете..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Молим вас сачекајте, учитавам базу података о пакетима..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Молим Вас сачекајте, приказујем пакете..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Молим Вас сачекајте, проналазим доступне пакете..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Проверавам %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "измене:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Уклони: %s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Користи %s као главни фајл"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Не ради ништа"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Инсталација готова"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Провери..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Сви пакети, који сте захтевали, су успешно инсталирани."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Проблем за време инсталирања"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1593,17 +2037,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Не могу да добавим изворне пакете."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Не могу да добавим изворне пакете, жао ми је. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1615,68 +2060,96 @@ msgstr ""
 "Пријављена Грешка(е):\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Да би задовољили међузависности, следећи пакет(и) такође треба\n"
+"да се инсталирају:\n"
+"\n"
+msgstr[1] ""
+"Да би задовољили међузависности, следећи пакет(и) такође треба\n"
+"да се инсталирају:\n"
+"\n"
+msgstr[2] ""
 "Да би задовољили међузависности, следећи пакет(и) такође треба\n"
 "да се инсталирају:\n"
 "\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Уклони кључ"
+msgstr[1] "Уклони кључ"
+msgstr[2] "Уклони кључ"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Следећи пакети треба да буду уклоњени да би се други инсталирали:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"да ли је у реду да наставим?"
+msgstr[1] ""
+"Следећи пакети треба да буду уклоњени да би се други инсталирали:\n"
+"\n"
+"%s\n"
+"\n"
+"да ли је у реду да наставим?"
+msgstr[2] ""
 "Следећи пакети треба да буду уклоњени да би се други инсталирали:\n"
 "\n"
 "%s\n"
 "\n"
 "да ли је у реду да наставим?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Инициялизация..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Инсталација пакета..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Само моменат..."
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Да ли је У реду да наставим?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Промени медијум"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Убаците медијум са именом \"%s\" у уређај [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Довнлоад-ујем пакете `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Провера потписа на пакетима..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1690,12 +2163,13 @@ msgstr ""
 "\n"
 "да ли желите да наставите инсталацију?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Инсталација неуспела"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1707,26 +2181,28 @@ msgstr ""
 "\n"
 "Можда желите да ажурирате базу података за медије."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Припремам инсталацију пакета"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Припремам..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталирам пакет `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "не могу да приступим rpm датотеци [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1738,33 +2214,48 @@ msgstr ""
 "Направио сам неке фајлове са подешавањима, пример `.rpmnew' или `.rpmsave',\n"
 "можете да их проверите како би сте нешто предузели:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Нормалана информација"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Додатне информације о пакету..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Додатне информације о пакету..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Грешка"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Непоправљива грешка: није пронађен пакет за инсталацију."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Молим Вас сачекајте, уклањам пакете..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Проблем приликом уклањања"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1774,11 +2265,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Добродошли"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1790,8 +2283,8 @@ msgstr ""
 "Овај алат вам може помоћи да изаберете софтвер желите да уклоните са\n"
 "вашег рачунара."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1804,11 +2297,13 @@ msgstr ""
 "инсталирате на\n"
 "ваш рачунар."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1822,176 +2317,213 @@ msgstr ""
 "са програмима, на CD-у или DVD-у. Овај алат ће Вам помоћи да изаберете\n"
 "пакете које желите да инсталирате на Ваш рачунар."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "Уклањање пакета"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Унесите своју email адресу доле"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Корисничко име:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Уклањање пакета"
 
-#: ../rpmdrake.pm:174
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "Уклањање пакета"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Инсталација пакета"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Да"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Информације..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Аустрија"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Аустралија"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Белгија"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Бразил"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Швајцарска"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Костарика"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Чешка"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Немачка"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Данска"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Грчка"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Шпанија"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Финска"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Француска"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Мађарска"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Израел"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Италија"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Јапан"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Кореја"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Холандија"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Норвешка"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Пољска"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Португал"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Русија"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Шведска"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Славачка"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Тајван"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Уједињено Краљевство"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Кина"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Сједињене Америчке Државе"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2003,7 +2535,8 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2015,28 +2548,30 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Молим Вас сачекајте, скидам листу додатних адреса са Mandriva-овог веб сајта."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Молим Вас сачекајте, скидам листу додатних адреса са Mandriva-овог веб сајта."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Грешка током преузимања са интернета"
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2051,7 +2586,7 @@ msgstr ""
 "Покушајте касније поново."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2066,14 +2601,17 @@ msgstr ""
 "Покушајте касније поново."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Нема мирора"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2088,63 +2626,68 @@ msgstr ""
 "од стране Mandriva Linux Official Updates."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Изаберите сајт по жељи."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Копирам фајл за медиј `%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Испитујем фајл за медиј `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Испитујем удаљени фајл  за медиј `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " урађено."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " неуспело!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s за медиј %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Покрећем download са `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download са `%s', време до краја:%s, брзина:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download са `%s', брзина:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Молим Вас сачекајте, ажурирам медијум..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2154,29 +2697,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Ажурирање медија"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Изаберите медиј који желите да ажурирате:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Изабери све"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Ажурирање"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2188,25 +2731,26 @@ msgstr ""
 "Грешке:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Не могу да направим медијум."
 
-#: ../rpmdrake.pm:840
-#, fuzzy
+#: ../rpmdrake.pm:836
+#, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Молимо Вас да сачекате, додајем медијум..."
 
-#: ../rpmdrake.pm:841
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:837
+#, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2216,27 +2760,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Помоћ покренута у позадини"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2309,7 +2855,7 @@ msgstr "Одговор Фтп Веирд PASV-а\n"
 
 #: ../grpmi/curl_download/curl_download.xs:172
 msgid "FTP unexpected 227 format\n"
-msgstr "ФТП унехпецтед 227 формат\n"
+msgstr "FTP unexpected 227 format\n"
 
 #: ../grpmi/curl_download/curl_download.xs:175
 msgid "FTP can't get host\n"
@@ -2512,21 +3058,22 @@ msgstr "Уклони софтвер"
 msgid "Software Media Manager"
 msgstr "Менаџер за Медије са софтвером"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Молим вас сачекајте, учитавам базу података о пакетима..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Није пронађен пакет за инсталацију."
 
-#~ msgid "Stop"
-#~ msgstr "Стоп"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "Сви пакети, по медијима"
 
-#~ msgid "Normal information"
-#~ msgstr "Нормалана информација"
-
 #~ msgid "Maximum information"
 #~ msgstr "Потпуна информација"
 
@@ -2548,9 +3095,6 @@ msgstr "Менаџер за Медије са софтвером"
 #~ msgid "Keys"
 #~ msgstr "Кључеви"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/П_реглед"
 
diff --git a/po/sr.pom b/po/sr.pom
index f240c2ad..00360522 100644
--- a/po/sr.pom
+++ b/po/sr.pom
@@ -11,6 +11,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:999
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 3e609d4a..229a99b6 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +20,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -39,17 +42,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "Obične nadogradnje"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -64,203 +68,239 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Molim Vas sačekajte, ažuriram medijum..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Dodaj medij"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Lokalni fajlovi"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Putanja:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP server"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Putanja ili tačka montiranja:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Prenosni uređaj"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Putanja ili tačka montiranja:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Traži..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Prijava:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativna putanja ka synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "ukoliko ostavite prazno, synthesis/hdlist će biti automatski testirana"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "Izaberite medij koji želite da ažurirate:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 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
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
-"VeKj postoji medij sa tim imenom, da li\n"
+"Vekj postoji medij sa tim imenom, da li\n"
 "zaista želite da je zamenite?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Dodajem medij:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Tip medija:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Pripremam instalaciju paketa"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "uvek"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "nikad"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Neki paketi ne mogu da se instaliraju"
 
-#: ../edit-urpm-sources.pl:325
-#, fuzzy
+#: ../edit-urpm-sources.pl:334
+#, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "Download sa `%s', brzina:%s"
 
-#: ../edit-urpm-sources.pl:355
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "Uklanjanje paketa"
 
-#: ../edit-urpm-sources.pl:356
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:365
+#, fuzzy, c-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:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Molimo Vas da sačekate, uklanjam medijum..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Izmeni medij"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Menjam medij \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Sačuvaj izmene"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proksi..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Morate da ubacite medijum kako bi ste nastavili"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Podešavanje proksija"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -268,138 +308,172 @@ msgstr ""
 "Ako Vam je potrebna proksi, unesite ime domaćina i neobavezni port "
 "(sintaksa: <proksi-domacin[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Ime proksi domaćina(hostname):"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Korisnik:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Doaj paralelnu grupu"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Uredite paralelnu grupu"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Dodaj limit za medij"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Dodaj host"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Izmeni paralelnu grupu \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Ime grupe:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Limit medija:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Hosts:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Podesite paralelni urpmi (distribuirano pokretanje urpmi-ja)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grupa"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Limit za medije"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Limit za medije"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Komanda"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(nijedan)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Izmeni..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Upravlja ključevima za digitalne potpise paketa"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Medij"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Dodaj ključ"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Izaberi kljul koji treba dodati medijumu %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Ukloni ključ"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -407,66 +481,76 @@ msgstr ""
 "Da li ste sigurni da želite da uklonite ključ %s sa medija %s?\n"
 "(ime ključa: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Dodaj ključ..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Ukloni ključ"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Podešavanje medija"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Uključi?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Ažuriranje"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Dodaj..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Ažuriraj..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Uredi ključeve..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paralelno..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -476,7 +560,8 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -491,7 +576,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -499,100 +585,115 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Pokrenuto u korisničkom modu"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -602,547 +703,786 @@ 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Dostupnost"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arhiviranje"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Narezivanje diskova"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Komresija"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Ostalo"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Knjige"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Računarske knjige"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Često postavljana pitanja"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Upustva"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Komunikacije"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Baze podataka"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Razvoj"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME i GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE i Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editori"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Učenje"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Alati za fajlove"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Igrice"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Avantura"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Forumi"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Karte"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Ukrštenice"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sportovi"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategija"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Grafički desktop"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "bazirano na FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Monitoring"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedija"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Mreža"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Transfer fajlova"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Instant poruke"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Vesti"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Udaljeni pristup"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publikovanje"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Nauke"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomija"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Hemija"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Nauka o računarima"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Prirodne nauke"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Šelovi"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistem"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Osnovno"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Boot i Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Pakovanje"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Štampanje"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Iskorištenje"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Iskorištenje"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Fontovi"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konzola"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internacionalizacija"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel i hardver"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Biblioteke"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Serveri"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Alati za tekst"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Igračke"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Radna stanica"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Konzolni alati"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Stanica za igru"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Internet stanica"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimedijalna stanica"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Mrežni kompjuter, (klijent)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Radna(Office) stanica"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Naučna radna stanica"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Grafičko Okruženje"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Gnome radna stanica"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Desktop"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE padna stanica"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Drugi grafički desktopovi"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Server"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Server,Baze podataka"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Server, Firewall/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Mrežni Server"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Server, Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Nije dostupno)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Rezultati pretrage"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Rezultat pretrage (nema)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Molim Vas sačekajte, tražim..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Mogu se dodati"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Menadžer za Medije sa softverom"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Stop"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Mogu se ažurirati"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Nisu izabrani"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Mogu se dodati"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Izabrani"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Nisu izabrani"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Važnost: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Razlog ažuriranja:"
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Sigurnosne nadogradnje"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Bez opisa"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Fajlovi:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Izmene:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Fajlovi:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Izmene:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Medij: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Trenutno instalirana verzija: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Verzija: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Veličina: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Sažetak: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Opis:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Menadžer za Medije sa softverom"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Dodatne informacije o paketu..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Jedan od sledećih paketa je potreban:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Izaberite"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Jedan od sledećih paketa je potreban:"
+msgstr[1] "Jedan od sledećih paketa je potreban:"
+msgstr[2] "Jedan od sledećih paketa je potreban:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Molim Vas sačekajte, prikazujem pakete..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Bez ažuriranja"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1151,26 +1491,31 @@ msgstr ""
 "Lista paketa za ažuriranje nije kreirana. Ovo ili znači ili da nema "
 "dostupnih\n"
 "paketa za ažuriranje za vaš računar,\n"
-"ili su oni veKj instalirani."
+"ili su oni vekj instalirani."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Sve"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Još informacija"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informacije o paketima"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Još neki paketi moraju biti uklonjeni"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1178,11 +1523,13 @@ msgstr ""
 "Da bi zadovoljili sve zavisnosti,sledeći paket(i) bi takođe trebalo da se "
 "uklone:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Neki paketi se ne mogu ukloniti"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1190,7 +1537,8 @@ msgstr ""
 "Žalim, ali uklanjanjem ovih paketa bi ste oštetiti sistem:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1200,11 +1548,13 @@ msgstr ""
 "da budu neizabrani:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Potrebni su dodatni paketi"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1214,132 +1564,169 @@ msgstr ""
 "da se instaliraju:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Neki paketi ne mogu da se instaliraju"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Neki paketi ne mogu da se instaliraju"
+msgstr[1] "Neki paketi ne mogu da se instaliraju"
+msgstr[2] "Neki paketi ne mogu da se instaliraju"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Žalim, ali  sledeći paket(i)ne mogu da budu izabrani:\n"
+"\n"
+"%s"
+msgstr[1] ""
+"Žalim, ali  sledeći paket(i)ne mogu da budu izabrani:\n"
+"\n"
+"%s"
+msgstr[2] ""
 "Žalim, ali  sledeći paket(i)ne mogu da budu izabrani:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Neki paketi moraju da se uklone"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Izabrano: %s / Slobodan prostor na disku: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Veličina izabranog: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Pojavila se fatalna greška: %s."
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Instaliraj"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Instaliraj"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-ov izbor"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Svi paketi, po abecedi"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Svi paketi, po dostupnosti nove verzije"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Svi paketi, po veličini"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Svi paketi, po stanju biranja"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "sortirani po datumu instalacije"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Svi paketi, po grupi"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Obične nadogradnje"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Sigurnosne nadogradnje"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Nadogradnje sa ispravkama"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Obične nadogradnje"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Sigurnosne nadogradnje"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "u imenima"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "u opisima"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "u imenima fajlova"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Prvo morate da odaberete neke pakete."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Izabrali ste previše paketa"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1355,133 +1742,171 @@ msgstr ""
 "\n"
 "Da li zaista želite da instalirate izabrane pakete?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Fajl"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Ažuriranje medij"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Ponovo izaberi"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/P_onovo učitaj listu paketa"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Kraj"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Opcije"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Menadžer za Medije sa softverom"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Automatski prikaži izabrane pakete"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Prijavite Bag"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_O..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "Toma Jankovic_<tomaja@net.yu>\n"
+msgstr "Toma Jankovic <tomaja@net.yu>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Pronađi:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Traži"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Očisti"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Izaberi sve"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Promeni"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Kraj"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Fatalna greška"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Pojavila se fatalna greška: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Samo momenat..."
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Instalacija paketa..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Inicijalizacija..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "LAN konfiguracija"
+msgstr "Konfiguracija"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1493,12 +1918,13 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Već postojići medij za ažuriranje"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1515,12 +1941,13 @@ msgstr ""
 "\n"
 "Zatim  restartujte  %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kako ručno izabrati svoj miror sajt"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1534,56 +1961,73 @@ msgstr ""
 "\n"
 "Zatim, restarujte %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "u opisima"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Molim Vas sačekajte, pronalazim dostupne pakete..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Molim vas sačekajte, učitavam bazu podataka o paketima..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Molim Vas sačekajte, prikazujem pakete..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Molim Vas sačekajte, pronalazim dostupne pakete..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Proveravam %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "izmene:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Ukloni: %s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Koristi %s kao glavni fajl"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Ne radi ništa"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Instalacija gotova"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Proveri..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Svi paketi, koji ste zahtevali, su uspešno instalirani."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Problem za vreme instaliranja"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1593,17 +2037,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Ne mogu da dobavim izvorne pakete."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ne mogu da dobavim izvorne pakete, žao mi je. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1615,68 +2060,96 @@ msgstr ""
 "Prijavljena Greška(e):\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Da bi zadovoljili međuzavisnosti, sledeći paket(i) takođe treba\n"
+"da se instaliraju:\n"
+"\n"
+msgstr[1] ""
+"Da bi zadovoljili međuzavisnosti, sledeći paket(i) takođe treba\n"
+"da se instaliraju:\n"
+"\n"
+msgstr[2] ""
 "Da bi zadovoljili međuzavisnosti, sledeći paket(i) takođe treba\n"
 "da se instaliraju:\n"
 "\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Ukloni ključ"
+msgstr[1] "Ukloni ključ"
+msgstr[2] "Ukloni ključ"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Sledeći paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"da li je u redu da nastavim?"
+msgstr[1] ""
+"Sledeći paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
+"\n"
+"%s\n"
+"\n"
+"da li je u redu da nastavim?"
+msgstr[2] ""
 "Sledeći paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
 "\n"
 "%s\n"
 "\n"
 "da li je u redu da nastavim?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Inicijalizacija..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Instalacija paketa..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Samo momenat..."
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Da li je U redu da nastavim?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Promeni medijum"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ubacite medijum sa imenom \"%s\" u uređaj [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Download-ujem pakete `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Provera potpisa na paketima..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1690,12 +2163,13 @@ msgstr ""
 "\n"
 "da li želite da nastavite instalaciju?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Instalacija neuspela"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1707,26 +2181,28 @@ msgstr ""
 "\n"
 "Možda želite da ažurirate bazu podataka za medije."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Pripremam instalaciju paketa"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu da pristupim rpm datoteci [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1735,37 +2211,51 @@ msgid ""
 msgstr ""
 "Instalacija je gotova, %s.\n"
 "\n"
-"Napravio sam neke fajlove sa podešavanjima, primer `.rpmnew' ili `."
-"rpmsave',\n"
+"Napravio sam neke fajlove sa podešavanjima, primer `.rpmnew' ili `.rpmsave',\n"
 "možete da ih proverite kako bi ste nešto preduzeli:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Normalana informacija"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Dodatne informacije o paketu..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Dodatne informacije o paketu..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Greška"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Nepopravljiva greška: nije pronađen paket za instalaciju."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Molim Vas sačekajte, uklanjam pakete..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Problem prilikom uklanjanja"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1775,11 +2265,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1791,8 +2283,8 @@ msgstr ""
 "Ovaj alat vam može pomoći da izaberete softver želite da uklonite sa\n"
 "vašeg računara."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1805,11 +2297,13 @@ msgstr ""
 "instalirate na\n"
 "vaš računar."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1823,176 +2317,213 @@ 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:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "Uklanjanje paketa"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Unesite svoju email adresu dole"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Korisničko ime:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Uklanjanje paketa"
 
-#: ../rpmdrake.pm:174
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "Uklanjanje paketa"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Instalacija paketa"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Informacije..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australija"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Švajcarska"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Nemačka"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danska"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grčka"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Španija"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finska"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Francuska"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Mađarska"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italija"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Holandija"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slavačka"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Sjedinjene Američke Države"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2004,7 +2535,8 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2016,28 +2548,30 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Molim Vas sačekajte, skidam listu dodatnih adresa sa Mandriva-ovog veb sajta."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Molim Vas sačekajte, skidam listu dodatnih adresa sa Mandriva-ovog veb sajta."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Greška tokom preuzimanja sa interneta"
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2052,7 +2586,7 @@ msgstr ""
 "Pokušajte kasnije ponovo."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2067,14 +2601,17 @@ msgstr ""
 "Pokušajte kasnije ponovo."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Nema mirora"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2084,68 +2621,73 @@ msgid ""
 msgstr ""
 "Ne mogu da pronagjem nijedan odgovarajugji miror.\n"
 "\n"
-"Može postojati nekoliko razloga za ovaj problem; najčešKji je\n"
+"Može postojati nekoliko razloga za ovaj problem; najčeškji je\n"
 "slučaj da arhitektura vašeg procesora nije podržana\n"
 "od strane Mandriva Linux Official Updates."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Izaberite sajt po želji."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiram fajl za medij `%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Ispitujem fajl za medij `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ispitujem udaljeni fajl  za medij `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " urađeno."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " neuspelo!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s za medij %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Pokrećem download sa `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download sa `%s', vreme do kraja:%s, brzina:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download sa `%s', brzina:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Molim Vas sačekajte, ažuriram medijum..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2155,29 +2697,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Ažuriranje medija"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Izaberite medij koji želite da ažurirate:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Izaberi sve"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Ažuriranje"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2189,25 +2731,26 @@ msgstr ""
 "Greške:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Ne mogu da napravim medijum."
 
-#: ../rpmdrake.pm:840
-#, fuzzy
+#: ../rpmdrake.pm:836
+#, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Molimo Vas da sačekate, dodajem medijum..."
 
-#: ../rpmdrake.pm:841
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:837
+#, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2217,27 +2760,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Pomoć pokrenuta u pozadini"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2286,7 +2831,7 @@ msgstr "Nije moguća konekcija\n"
 
 #: ../grpmi/curl_download/curl_download.xs:154
 msgid "FTP unexpected server reply\n"
-msgstr "Odgovor Ftp weird servera\n"
+msgstr "Odgovor Ftp Weird servera\n"
 
 #: ../grpmi/curl_download/curl_download.xs:157
 msgid "FTP access denied\n"
@@ -2298,15 +2843,15 @@ msgstr "FTP korisnička lozinka netačna\n"
 
 #: ../grpmi/curl_download/curl_download.xs:163
 msgid "FTP unexpected PASS reply\n"
-msgstr "Odgovor Ftp weird PASS-a\n"
+msgstr "Odgovor Ftp Weird PASS-a\n"
 
 #: ../grpmi/curl_download/curl_download.xs:166
 msgid "FTP unexpected USER reply\n"
-msgstr "Odgovor Ftp weird USER-a\n"
+msgstr "Odgovor Ftp Weird USER-a\n"
 
 #: ../grpmi/curl_download/curl_download.xs:169
 msgid "FTP unexpected PASV reply\n"
-msgstr "Odgovor Ftp weird PASV-a\n"
+msgstr "Odgovor Ftp Weird PASV-a\n"
 
 #: ../grpmi/curl_download/curl_download.xs:172
 msgid "FTP unexpected 227 format\n"
@@ -2513,21 +3058,22 @@ msgstr "Ukloni softver"
 msgid "Software Media Manager"
 msgstr "Menadžer za Medije sa softverom"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Molim vas sačekajte, učitavam bazu podataka o paketima..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Nije pronađen paket za instalaciju."
 
-#~ 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"
 
@@ -2549,9 +3095,6 @@ msgstr "Menadžer za Medije sa softverom"
 #~ msgid "Keys"
 #~ msgstr "Ključevi"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/P_regled"
 
diff --git a/po/sr@Latn.pom b/po/sr@Latn.pom
index 41a213c3..f2764624 100644
--- a/po/sr@Latn.pom
+++ b/po/sr@Latn.pom
@@ -11,6 +11,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:999
diff --git a/po/sv.po b/po/sv.po
index 966ed01b..524fe283 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sv - Mandriva 2007 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-09-18 19:40+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -24,12 +24,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Välj mediatyp"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -52,16 +55,18 @@ 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:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Distributionskällor"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Officiella uppdateringar"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -78,85 +83,105 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Vänta, lägger till media..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Lägg till media"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Lokala filer"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Sökväg:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC-server"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP-server"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Sökväg eller monteringspunkt:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Flyttbar enhet"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Sökväg eller monteringspunkt:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Bläddra..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Användarnamn:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativ sökväg till synthesis eller hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 "Om detta lämnas tomt kommer synthesis/hdlist automatiskt att undersökas"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Skapa media för en hel distribution"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Sök i detta media efter uppdateringar:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Du måste fylla i åtminstone de två första posterna."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -164,109 +189,132 @@ msgstr ""
 "Det finns redan ett media med det namnet.\n"
 "Vill du verkligen ersätta det?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Lägger till media:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Typ av media:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Globala inställningar för paketinstallation..."
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "alltid"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "aldrig"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifiera RPMer för installation:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Program för nedladdning:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Mediaborttagande"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-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:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Vänta, tar bort media..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Redigera media"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Redigerar media \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, 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:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "För att kunna spara ändringarna måste du lägga i mediet i enheten."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Anpassa proxy"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxyinställningar för media \"%s\""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Globala proxyinställningar"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -274,114 +322,140 @@ msgstr ""
 "Om du behöver en proxy, ange värddatornamnet och en valfi port (syntax: "
 "<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxyvärddatornamn:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Användare:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Lägg till en parallell grupp"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Redigera en parallell grupp"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Lägg till en mediagräns"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Lägg till en värddator"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redigerar parallell grupp \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Gruppnamn:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Mediagräns:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Värddatorer:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, 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:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grupp"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Mediagräns"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Mediagräns"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Kommando"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(inget)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Lägg till..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Hantera nycklar för digitala signaturer för paket"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Media"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
@@ -389,25 +463,33 @@ msgstr ""
 "_:kryptonycklar\n"
 "Nycklar"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Lägg till en nyckel"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Stäng"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Ta bort en nyckel"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -415,32 +497,38 @@ msgstr ""
 "Är du säker på att du vill ta bort nyckeln %s från media %s?\n"
 "(nyckelns namn: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Lägg till en nyckel..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Ta bort nyckel"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Anpassa media"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Aktiverad?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Uppdateringar?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 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:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -450,32 +538,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Lägg till anpassad..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Uppdatera..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Hantera nycklar..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Parallell..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Globala inställningar"
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -485,7 +579,8 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -499,7 +594,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -510,12 +606,13 @@ msgstr ""
 "paketdatabasen (har du en annan pakethanterare på en annan\n"
 "arbetsyta, eller håller du redan på att installera paket?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Kan inte lägga till media, avsaknad av eller felaktiga argument."
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -525,8 +622,8 @@ msgstr ""
 "Du kommer att kunna installera ny programvara\n"
 "till ditt system från detta media."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -536,22 +633,23 @@ msgstr ""
 "Du kommer att kunna installera ny programvara\n"
 "till ditt system från detta media."
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Installation av media %s lyckades."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Installation av media %s lyckades."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Användning: %s [FLAGGA]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -559,37 +657,44 @@ msgstr ""
 "  --changelog-first      visa ändringslogg före fillista i "
 "beskrivningsfönstret"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     begränsa till angivet media"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 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:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            välj läge (installera (förval), ta bort, uppdatera)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, 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:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      uppdatera inte media vid start"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        verifiera inte paketsignaturer"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -597,27 +702,33 @@ 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:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    visa bara dessa paket"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      förvälj dessa paket"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 tvinga att köra som root"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           kör sökning efter  \"pkg\""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Kör i användarläge"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -628,545 +739,785 @@ msgstr ""
 "Du kan dock bläddra i den befintliga databasen."
 
 # OBS! Detta skall vara Tillgänglighet (se MDV bugzilla #6881)
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Tillgänglighet"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arkivering"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Säkerhetskopiering"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Cd-bränning"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Annan"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Böcker"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Datorböcker"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Vanliga frågor"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Litteratur"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Kluster"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Meddelandehantering"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Kötjänster"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Kommunikation"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Databaser"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Utveckling"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "Gnome och GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE och Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kärna"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Editorer"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Utbildning"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulatorer"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Filverktyg"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Spel"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Äventyr"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arkad"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Brädor"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kort"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Puzzel"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strategi"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Grafiskt skrivbord"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM-baserad"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Övervakning"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Nätverk"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chatt"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Filöverföring"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Instant messaging"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Diskussionsgrupper"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Fjärråtkomst"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Office"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Publika nycklar"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publicering"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Vetenskap"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomi"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Kemi"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Datorvetenskap"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geovetenskap"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematik"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fysik"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Skal"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Bas"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Inställningar"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Start och Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Hårdvara"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Paketering"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Utskrift"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Spridning"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Spridning"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Teckensnitt"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsoll"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmapp"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Internationellt"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kärna och hårdvara"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Bibliotek"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Servrar"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminaler"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Textverktyg"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Leksaker"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Arbetsstation"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Konsollverktyg"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Spelstation"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Internetstation"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Multimediastation"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Nätverksdator (klient)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Kontorsarbetsstation"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Grafisk miljö"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Gnome-arbetsstation"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "IceWm Skrivborsmiljö"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE-arbetsstation"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Andra grafiska skrivbordsmiljöer"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Server"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Databas"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Brandvägg/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Nätverksserver"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Webb/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Ingen tillgänglig)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Sökresultat"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Sökresultat (inget)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Vänta, söker..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Kan läggas till"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Programhantering"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Stoppa"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Kan uppdateras"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Inte vald"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Kan läggas till"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Vald"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Inte vald"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Viktighet: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Orsak för uppdatering: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Säkerhetsrekommendation"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Ingen beskrivning"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Filer:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Ändringslogg:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Filer:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Ändringslogg:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Media: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Installerad version: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Version: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Arkitektur: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Storlek: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Sammanfattning: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Beskrivning: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Programhantering"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Mer information om paket..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Ett av följande paket krävs:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Välj"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Ett av följande paket krävs:"
+msgstr[1] "Ett av följande paket krävs:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Vänta, listar paket..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Ingen uppdatering"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1176,34 +1527,41 @@ 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:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Alla"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Mer information"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Information om paket"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Några ytterligare paket måste tas bort"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "På grund av deras beroenden måste följande paket också tas bort:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Vissa paket kan inte tas bort"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1211,7 +1569,8 @@ msgstr ""
 "Om du tar bort dessa paket kommer systemet att sluta fungera:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1221,11 +1580,13 @@ msgstr ""
 "avmarkeras:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Ytterligare paket krävs"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1234,129 +1595,164 @@ msgstr ""
 "För att uppfylla beroenden måste följande paket också installeras:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (tillhör undantagslistan)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Vissa paket kan inte installeras"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Vissa paket kan inte installeras"
+msgstr[1] "Vissa paket kan inte installeras"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Följande paket kan inte väljas:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Följande paket kan inte väljas:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Vissa paket måste tas bort"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Valda: %s / ledigt diskutrymme: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Vald storlek: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Ingen beskrivning tillgänglig för detta paket\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Ett allvarligt fel inträffade: %s."
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Installerad"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Inte Installerad"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr " %s val"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-val"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Alla paket, alfabetiskt"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Alla paket, efter uppdateringstillgänglighet"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Alla paket, efter storlek"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Alla paket, efter valstatus"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Ensamma paket; sorterat efter installationsdatum"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Alla paket, efter grupp"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Alla uppdateringar"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Säkerhetsuppdateringar"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Felrättningsuppdateringar"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Normala uppdateringar"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Säkerhetsuppdateringar"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "i namn"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "i beskrivningar"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "i filnamn"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Fel: %s verkar vara monterad som read-only."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Du måste välja några paket först."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "För många paket är valda"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1372,75 +1768,90 @@ msgstr ""
 "\n"
 "Vill du verkligen installera alla valda paket?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Uppdatera media"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/Å_terställ valet"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Ladda om _paketlistan"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/Av_sluta"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Inställningar"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Mediahanterare"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Visa auto_matiskt valda paket"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapportera fel"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Om..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "Om Rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s, Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake är Mandriva Linux pakethanterings-verktyg."
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Thomas Backlund <tmb@mandriva.org>\n"
@@ -1451,61 +1862,88 @@ msgstr ""
 "Mattias Dahlberg <voz@home.se>\n"
 "Tom Svensson <tom@firstdev.com>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Hitta:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Sök"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Töm"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Välj alla"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Verkställ"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Snabb introduktion"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "Du kan bläddra genom paketen genom kategoriträdet till vänster."
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Du kan se information om ett paket genom att klicka på det i listan till "
 "höger."
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "För att installera, uppdatera eller ta bort ett paket, klicka på \"valrutan"
 "\"."
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Allvarligt fel"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Ett allvarligt fel inträffade: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Vänta"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Paketinstallation..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Initierar..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Bekräftelse"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1517,12 +1955,13 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Uppdateringsmedia som redan finns"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1537,12 +1976,13 @@ msgstr ""
 "\n"
 "Starta sedan om '%s'."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hur du manuellt väljer en spegel"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1556,56 +1996,73 @@ msgstr ""
 "\n"
 "Starta sedan om %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "i beskrivningar"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vänta, hittar tillgängliga paket..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Vänta, läser paketdatabas..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Vänta, listar paket..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Vänta, hittar tillgängliga paket..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Undersöker %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "ändringar:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Ta bort .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Använd .%s som huvudfil"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Gör ingenting"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Installation slutförd"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Undersök..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Alla begärda paket installerades utan problem."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Problem under installation"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1615,17 +2072,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Kunde inte hämta källpaket."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Kan inte hämta källpaket, %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1637,67 +2095,83 @@ msgstr ""
 "Fel rapporterade:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"För att tillfredsställa beroenden kommer följande %d paket att installeras:\n"
+"%s\n"
+msgstr[1] ""
 "För att tillfredsställa beroenden kommer följande %d paket att installeras:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Ta bort en nyckel"
+msgstr[1] "Ta bort en nyckel"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Följande paket måste tas bort för att andra ska kunna uppdateras:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"Är det OK att fortsätta?"
+msgstr[1] ""
 "Följande paket måste tas bort för att andra ska kunna uppdateras:\n"
 "\n"
 "%s\n"
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Initierar..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Paketinstallation..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Vänta"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Är det OK att fortsätta?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Byt media"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lägg i media med namn \"%s\" i enhet [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laddar ner paket \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Verifierar paketsignaturer..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Varning"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1711,12 +2185,13 @@ msgstr ""
 "\n"
 "Vill du fortsätta med installationen?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Installationen misslyckades"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1728,25 +2203,28 @@ msgstr ""
 "\n"
 "Du kanske ska uppdatera din mediadatabas."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Förbereder paketinstallation..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Förbereder..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerar paket \"%s\" (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kan inte läsa rpm-fil [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1758,33 +2236,48 @@ msgstr ""
 "Några konfigurationsfiler skapades som \".rpmnew\" eller \".rpmsave\",\n"
 "du kan nu undersöka några för att vidta åtgärder:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Normal information"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Dessa paket kommer med uppgraderingsinformation"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Mer information om paket..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Mer information om paket...[%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Fel"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Fel som ej går att reparera: inget paket hittat för installation."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Vänta, tar bort paket..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Problem vid borttag"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1794,11 +2287,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Välkommen"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1810,8 +2305,8 @@ msgstr ""
 "Det här verktyget hjälper dig att välja vilka program du vill ta bort från\n"
 "datorn."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1823,11 +2318,13 @@ msgstr ""
 "Det här verktyget hjälper dig att välja uppdateringarna du vill\n"
 "installera på datorn."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Välkommen till verktyget för programinstallation!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1841,172 +2338,213 @@ 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:102
-msgid "Mandriva Linux Update"
-msgstr "Uppdatera Mandriva Linux"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Uppdatera Program"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Uppdatera Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, c-format
 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:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Användarnamn:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Paketborttag"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Uppdatera Paket"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Installation av mjukvarupaket"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Nej"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Information..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Österrike"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Australien"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Schweiz"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Tjeckien"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grekland"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Frankrike"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Ungern"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Italien"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Nederländerna"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norge"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polen"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Ryssland"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakien"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Amerikas förenta stater"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2018,7 +2556,8 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2030,25 +2569,28 @@ msgstr ""
 "\n"
 "Är det OK att fortsätta?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Val av spegelserver"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Vänta, laddar ner spegeladresser."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Vänta, laddar ner spegeladresser från Mandrivas webbplats."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Fel vid nerladdning"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2063,7 +2605,7 @@ msgstr ""
 "Försök igen senare."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2078,14 +2620,17 @@ msgstr ""
 "Försök igen senare."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Ingen spegel"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Kan inte hitta en passande spegel."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2100,63 +2645,68 @@ msgstr ""
 "uppdateringar."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Välj önskad spegel."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierar fil för media \"%s\"..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Undersöker fil för media \"%s\"..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Undersöker fjärrfil för media \"%s\"..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " klar."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " misslyckades."
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s från media %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Startar nedladdning av `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Nedladdnig av \"%s\", återstående tid:%s, hastighet:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Nedladdnig av \"%s\", hastighet:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Vänta, uppdaterar media..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Fel vid hämtning av paket"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2172,31 +2722,31 @@ msgstr ""
 "to reconfigure it, either it is currently unreachable and you should retry\n"
 "later."
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Uppdatera media"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, 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:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Välj media du vill uppdatera:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Välj alla"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Uppdatera"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2208,8 +2758,8 @@ msgstr ""
 "Fel:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2219,16 +2769,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Kan inte skapa media."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Fel vid tillägg av media"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2238,8 +2790,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2249,8 +2801,8 @@ msgstr ""
 "version av %s som du kör (%s).\n"
 "Detta media kommer att avaktiveras."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2260,11 +2812,13 @@ msgstr ""
 "version av Mandriva Linux som du kör (%s).\n"
 "Detta media kommer att avaktiveras."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Hjälp startad i bakgrunden"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 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."
@@ -2539,21 +3093,18 @@ msgstr "Ta bort program"
 msgid "Software Media Manager"
 msgstr "Programhanterare för media"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Vänta, läser paketdatabas..."
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Inget paket hittat för installation."
 
-#~ 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"
 
diff --git a/po/ta.po b/po/ta.po
index 831e1ccb..b43d88bc 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -36,17 +39,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "சாதரன புதுப்பித்தல்"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -61,88 +65,104 @@ msgstr ""
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "தயவுசெய்து காத்திருக்கவும்.... ஊடகம் புதுப்பிக்கப்படுகிறது"
 
-#: ../edit-urpm-sources.pl:134
-#, fuzzy
+#: ../edit-urpm-sources.pl:144
+#, fuzzy, c-format
 msgid "Add a medium"
 msgstr "புதிய மூலம் சேர்க்கப்படுகிறது"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "உள்ளமைக் கோப்புகள்"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "பாதை:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP பாிமாறி"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP பாிமாறி"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP பாிமாறி"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "பாதை அல்லது ஏற்றப்புள்ளி"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "கழற்று சாதனங்கள்"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "பாதை அல்லது ஏற்றப்புள்ளி"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "ேமலோடு..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "பயனர்கணக்கு"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "கடவுச்செல்:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist ேகாப்புகளின் சார்பு பாதை"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "பெயர்:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "நீங்கள் புதுப்பிக்க விரும்புகிற  மூலங்களை தேர்வு செய்யவும்"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "நீங்கள் குைறந்தபட்சம் மேலிருக்கும் முதல் இரண்டு கேள்விக்கு பதில் அளிக்கவும்"
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -150,117 +170,132 @@ msgstr ""
 "இதே பெயரில் ஊடகம் ஒன்றுள்ளது,நீங்கள் \n"
 "நிச்சயமாக இதனை மாற்ற போகிறிர்களா?"
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy
+#: ../edit-urpm-sources.pl:252
+#, fuzzy, c-format
 msgid "Adding a medium:"
 msgstr "புதிய மூலம் சேர்க்கப்படுகிறது"
 
-#: ../edit-urpm-sources.pl:245
-#, fuzzy
+#: ../edit-urpm-sources.pl:254
+#, fuzzy, c-format
 msgid "Type of medium:"
 msgstr "மூலத்தின் வகை"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "தவிர்"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "சரி"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "எப்போதும் இல்லை"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr " `%s'  என்ற பொதியை நிறுவ முடியவில்ைல\n"
 
-#: ../edit-urpm-sources.pl:325
-#, fuzzy
+#: ../edit-urpm-sources.pl:334
+#, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "`%s' இறக்கத்தின் ேவகம்:%s , "
 
-#: ../edit-urpm-sources.pl:355
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "ெமன்ெபாருள் நீக்கம்"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "தயவுசெய்து காத்திருக்கவும்.... ஊடகம் நீக்கப்படுகிறது"
 
-#: ../edit-urpm-sources.pl:398
-#, fuzzy
+#: ../edit-urpm-sources.pl:405
+#, fuzzy, c-format
 msgid "Edit a medium"
 msgstr "மூலத்ைத திருத்தி அமை"
 
-#: ../edit-urpm-sources.pl:404
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:411
+#, fuzzy, c-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\": என்ற மூலத்ைத திருத்தியமை"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "மாற்றங்களை சேமி"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
-#, fuzzy
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, fuzzy, c-format
 msgid "Proxy..."
 msgstr " பிழை நேர்ந்துள்ளது..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "தொடர்ந்து செல்ல நீங்கள் ஊடகத்ைத உள்ளீடு செய்ய வேண்டும்"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "நீங்கள் செய்த மாற்றங்களை சேமிக்க, நீங்கள் ஊடகத்ைத உள்ளீடு செய்ய வேண்டும்"
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "பினாமிகளை வடிவமை"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -268,209 +303,247 @@ msgstr ""
 "உங்களுக்கு பினாமி தேவைப்பட்டால், பினாமியின்  பயனர் பெயரையும் துறையையும் கொடுக்கவும்"
 "(மாதிரி: <proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "பினாமியின் பெயர்"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "நீங்கள் பயனர்/கடவுச்ெசால்ைல கொடுத்தால் தான் பினாமியை பயன்படுத்த முடியும்"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "பயனர்:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:565
-#, fuzzy
+#: ../edit-urpm-sources.pl:577
+#, fuzzy, c-format
 msgid "Add a medium limit"
 msgstr "புதிய மூலம் சேர்க்கப்படுகிறது"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:651
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:663
+#, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "\"%s\": என்ற மூலத்ைத திருத்தியமை"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "குழுப்பெயர்"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "வரையறை:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "சேர்"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "நீக்கு"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "குழு"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "வரைமுறை"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "கட்டளை"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(ஒன்றுமில்ைல)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "தொகு"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "சேர்..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "நடுத்தர"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:798
-#, fuzzy
+#: ../edit-urpm-sources.pl:816
+#, fuzzy, c-format
 msgid "Add a key"
 msgstr "சேர்..."
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:838
-#, fuzzy
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "மூடு"
+
+#: ../edit-urpm-sources.pl:856
+#, fuzzy, c-format
 msgid "Remove a key"
 msgstr " ெமன்ெபாருளை நீக்கவும்"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-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:857
-#, fuzzy
+#: ../edit-urpm-sources.pl:875
+#, fuzzy, c-format
 msgid "Add a key..."
 msgstr "சேர்..."
 
-#: ../edit-urpm-sources.pl:861
-#, fuzzy
+#: ../edit-urpm-sources.pl:879
+#, fuzzy, c-format
 msgid "Remove key"
 msgstr "நீக்கு"
 
-#: ../edit-urpm-sources.pl:877
-#, fuzzy
+#: ../edit-urpm-sources.pl:895
+#, fuzzy, c-format
 msgid "Configure media"
 msgstr "மூலங்களை வடிவமை"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "ெசயல்படுத்தப்பட்டுள்ளதா?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "புதுப்பிக்கவும்"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "சேர்..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "புதுப்பிக்கவும்..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "உதவி"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -480,8 +553,8 @@ msgstr ""
 "\n"
 "இப்படியே தொடரலாமா?"
 
-#: ../edit-urpm-sources.pl:1033
-#, fuzzy
+#: ../edit-urpm-sources.pl:1054
+#, fuzzy, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -495,7 +568,8 @@ msgstr ""
 "வடிவமைத்த பிறகு இந்த பொதிகளை நிரல்களை நிறுவ அல்லது \n"
 "நிகழ்நிலைப்படுத்தலாம்"
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -503,648 +577,900 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "பயன்பாடு: %s [விருப்பத்தேர்வுகள்]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "கிட்டுதல்"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "ஆவணப்படுத்துதல்"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "கோப்புகளைச் சேமித்தல்"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "குறுந்தட்டில் எழுதுதல்"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "அளவைக் குறைத்தல்"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "மற்ற"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
-#, fuzzy
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, fuzzy, c-format
 msgid "Books"
 msgstr "மற்ற"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr ""
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "தொடர்பு"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "தரவுத்தளம்"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "முன்னேற்றம்"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "ஜாவா"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "வித்து"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "பியர்ல்"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "பைத்தான்"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "திருத்துவோர்"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "கல்வி"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "மற்றொன்றைப்போல் நடப்பான்"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "கோப்புக் கருவிகள்"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "விளையாட்டுகள்"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "தேடுதல் விளையாட்டு"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "ஆர்கேட்"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "அட்டை விளையாட்டுகள்"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "சீட்டுக்கட்டு விளையாட்டுகள்"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "புதிர்கள்"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "விளையாட்டு"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "திறனாய்வு"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Eசாளரம்"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "குனோம்"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "Kசாளரமைப்பு"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "சாஃபிஷ்"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "வரைபடம்"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "கண்காணி"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "பல்லூடகம்"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "ஒளித்தோற்றம்"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "வலையமைப்பு"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "அரட்டை"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "கோப்புப் பரிமாற்றம்"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "உடனடித் தொடர்பு (messenger)"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "அஞ்சல்"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "செய்தியஞ்சல்"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "தொலை அணுகல்"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "வைய விரி வலை"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "அலுவல்செயலிகள்"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "அச்சகப் பயன்பாடுகள்"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "அறிவியல்"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "வான்வெளியியல்"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "உயிரியல்"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "வேதியியல்"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "கணினியல்"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "புவியியல்"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "கணிதம்"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "இயற்பியல்"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "ஓடுகள்"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "ஒலி"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "கணினி அமைப்பு"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "அடிப்படை"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "வடிவமைப்பு"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "தொடங்குதல்"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "வன்பொருள்"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "rpmதொகுப்பு"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "அச்சு மேலாளர்"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "ஒரே வரிசையில் நிறுத்துதல்"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "ஒரே வரிசையில் நிறுத்துதல்"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "எழுத்துரு"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "முனையம்"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "நூலகங்கள்"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "சேவையகங்கள்"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "முனையம்"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "உரை கருவிகள்"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "பொம்மைகள்"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "வேலைக்களம்"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "முனையக் கருவிகள்"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "உதவிநூல்"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "விளையாட்டுகள்"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "இணையக் கணினி"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "பல்லூடக கணினி"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "வலையமைப்புக் கணினி(வேண்டி)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "அலுவல் கருவிகள்"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "அறிவியல் பணிக்கணினி"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "வரைவியல்வழி சூழல்கள்"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "குேனாம் பணிக்கணினி"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "மேசைசெயலி"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "Kசாளரமைப்பு பணிக்கணினி"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "மற்ற வரைவியல்வழி  மேலாளர்கள்"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "சேவையகம்"
+
+#: ../rpmdrake:357
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS "
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "தரவுதளங்கள்"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "நெருப்புச்சுவர்/வழிப்படுத்தி"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "வலையமைப்பக பரிமாறி"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "இணையதள/கோப்புப் பாிமாற்றம்"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(கிைடக்கவில்ைல)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "தேடலின் முடிவுகள்"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "தேடலின் முடிவுகள்(ஒன்றுமில்ைல)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "தயவுசெய்து காத்திருக்கவும்..தேடப்படுகிறது"
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "சேர்க்கப்படக்கூடிய"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "நிரல் மேலாண்மை"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "நிறுத்து"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "புதுப்பிக்கக்கூடிய"
 
-#: ../rpmdrake:560
-#, fuzzy
-msgid "Not selected"
-msgstr "பொதிகளிடையே பிரச்சினைகள் எழுகிறது"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "சேர்க்கப்படக்கூடிய"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "தேர்வு ெசய்யப்பட்டுள்ளது"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "பொதிகளிடையே பிரச்சினைகள் எழுகிறது"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "முக்கியத்துவம்: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "புதுப்பிக்க வேண்டிய காரனம்"
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "பாதுகாப்பு புதுப்பித்தல்"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "இவரிக்க வில்லை"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "கோப்புகள்:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "மாற்றப்பதிவு:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "கோப்புகள்:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "மாற்றப்பதிவு:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "தற்ேபாது நிறுவப்பட்டுள்ள பொதியின் வெளியீடு: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "பெயர்: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "வெளியீடு: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "அளவு: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "விவரம்: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "விளக்கம்: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "நிரல் மேலாண்மை"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "பொதிகளைப் பற்றிய மேலும் விவரங்கள்"
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "கீழுள்ள பொதிகளில் ஒன்று தேவை"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "தயவுசெய்து ேதர்ந்ெதடுக்கவும்"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "கீழுள்ள பொதிகளில் ஒன்று தேவை"
+msgstr[1] "கீழுள்ள பொதிகளில் ஒன்று தேவை"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "தயவுசெய்து காத்திருக்கவும், பொதிகள் பட்டியலிடப்படுகிறது"
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "புதுப்பிக்க ஒன்றுமில்ைல"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1154,36 +1480,41 @@ msgstr ""
 "அப்படியென்றால் நிகழ்நிலைப்படுத்த புதிய பொதிகள் ஏதுமில்ைல,\n"
 "அல்லது அனைத்தும் நிறுவப்பட்டுவிட்டன."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "அனைத்து"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
-#, fuzzy
+#: ../rpmdrake:956 ../rpmdrake:961
+#, fuzzy, c-format
 msgid "More info"
 msgstr "ேமலதிக விவரம்"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "பொதிகளைப் பற்றிய மேலதிக விவரங்கள்"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "மேலும் சில பொதிகள் நீக்கப்பட வேண்டும்"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "சில கட்டுப்பாடுகளினால் கீேழ ெகாடுக்கப்பட்டுள்ள பொதிகள் நீக்கப்பட  வேண்டும்:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
-#, fuzzy
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, fuzzy, c-format
 msgid "Some packages can't be removed"
 msgstr " `%s'  என்ற பொதியை நிறுவ முடியவில்ைல\n"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1191,7 +1522,8 @@ msgstr ""
 "மன்னிக்கவும், இந்த ெபாதிகளை நீக்கினால் அது உங்கள் கணினியை பழுதாக்கி விடும்\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1201,11 +1533,13 @@ msgstr ""
 "நிறுவப்படக்கூடாது, அவற்ைற ேதர்விலிருந்து விலக்குங்கள்:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "மேலும் சில பொதிகள் தேவை"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1215,138 +1549,162 @@ msgstr ""
 "வேண்டும்:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-#, fuzzy
-msgid "Some packages can't be installed"
-msgstr " `%s'  என்ற பொதியை நிறுவ முடியவில்ைல\n"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] " `%s'  என்ற பொதியை நிறுவ முடியவில்ைல\n"
+msgstr[1] " `%s'  என்ற பொதியை நிறுவ முடியவில்ைல\n"
 
-#: ../rpmdrake:945
-#, fuzzy, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"மன்னிக்கவும், கீேழ ெகாடுக்கப்பட்டுள்ள பொதிகளை தேர்வுச் செய்ய முடியவில்ைல:\n"
+"\n"
+msgstr[1] ""
 "மன்னிக்கவும், கீேழ ெகாடுக்கப்பட்டுள்ள பொதிகளை தேர்வுச் செய்ய முடியவில்ைல:\n"
 "\n"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "சில பொதிகள் நீக்கப்படவேண்டும்"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "ேதர்ந்ெதடுத்துள்ளவற்றின் அளவு: %s / தற்ேபாதுள்ள இடம்: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "ேதர்ந்ெதடுத்துள்ள அளவு: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "நிறுவு"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "நிறுவு"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "மாண்ட்ேரக் தேர்வுகள்"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "அனைத்து பொதிகளும்,அகர வரிசைப்படி"
 
-#: ../rpmdrake:1061
-#, fuzzy
+#: ../rpmdrake:1175
+#, fuzzy, c-format
 msgid "All packages, by update availability"
 msgstr "புதுப்பிக்கப்பட வேண்டியவையின்படி"
 
-#: ../rpmdrake:1062
-#, fuzzy
+#: ../rpmdrake:1176
+#, fuzzy, c-format
 msgid "All packages, by size"
 msgstr "அனைத்து பொதிகளும்"
 
-#: ../rpmdrake:1063
-#, fuzzy
+#: ../rpmdrake:1177
+#, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "தேர்வாகியுள்ளபடி"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1065
-#, fuzzy
+#: ../rpmdrake:1179
+#, fuzzy, c-format
 msgid "All packages, by group"
 msgstr "அனைத்து பொதிகளும்"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "சாதரன புதுப்பித்தல்"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "பாதுகாப்பு புதுப்பித்தல்"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "பிழைநீக்க புதுப்பித்தல்"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "சாதரன புதுப்பித்தல்"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "பாதுகாப்பு புதுப்பித்தல்"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "பெயர்களில்"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "விளக்கங்களில் "
 
-#: ../rpmdrake:1127
-#, fuzzy
+#: ../rpmdrake:1248
+#, fuzzy, c-format
 msgid "in file names"
 msgstr "கோப்புகளில்"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
-#, fuzzy
+#: ../rpmdrake:1279
+#, fuzzy, c-format
 msgid "You need to select some packages first."
 msgstr "மூலப் பொதிகள் கிடைக்கவில்ைல"
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "அளவுக்கதிகமான பொதிகள் தேர்வு செய்யப்பட்டுள்ளது"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1360,134 +1718,171 @@ msgstr ""
 "\n"
 "நீங்கள் இந்த எச்சரிக்கையை மீறி இவை அனைத்ைதயும் நிறுவ விரும்புகிறீர்களா?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_கோப்பு"
 
-#: ../rpmdrake:1191
-#, fuzzy
+#: ../rpmdrake:1320
+#, fuzzy, c-format
 msgid "/_Update media"
 msgstr "புதுப்பிக்கப்பட வேண்டிய மூல(ங்கள்)"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/தேர்வுகளை மறந்து விடு"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/பொதிகளின் பட்டியலை மீலேற்றவும்"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_வெளிச்செல்"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_விருப்பத்தேர்வு"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr " ெமன்ெபாருள் மூலங்கள் மேலாளர்"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/தானாக தேர்வுச் செய்யப்பட்டுள்ள பொதிகளைக் காட்டு"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_உதவி"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_பிழைகளை அறிவிக்க"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_பற்றி"
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "டிேரக்ெமன்ெபாருள்"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "கண்டுபிடி:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "தேடு"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "துடை"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, fuzzy, c-format
+msgid "Select all"
+msgstr "தேர்வு ெசய்யப்பட்டுள்ளது"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "செயல்படுத்து"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "ெவளிச்ெசல்"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "சிறிய பிழை"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr ""
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "தயவுசெய்து காத்திருக்கவும்.."
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "துவக்கப்படுகிறது..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "வலையமைப்பாக்க  வடிவமைப்பு"
+msgstr "வடிவமைப்புகள்"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1499,13 +1894,13 @@ msgstr ""
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../rpmdrake:1378
-#, fuzzy
+#: ../rpmdrake:1543
+#, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "புதுப்பித்தல்ல் ஊடகத்தில் பிழை நேர்ந்துள்ளது"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1515,12 +1910,13 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "உங்கள் இணைபதிப்ைப ைகமுைறயாக எப்படித் தேர்வுச் செய்வது"
 
-#: ../rpmdrake:1390
-#, fuzzy, perl-format
+#: ../rpmdrake:1556
+#, fuzzy, c-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"
@@ -1529,57 +1925,73 @@ msgid ""
 "Then, restart %s."
 msgstr "உங்கள் இணை பதிப்ைப எப்படித் தேர்வுச் செய்வது"
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "விளக்கங்களில் "
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "தயவுசெய்து காத்திருக்கவும்..இருக்கும் பொதிகளை கண்டுபிடிக்கப் படுகிறது"
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "தயவுசெய்து காத்திருக்கவும்...பொதித் தரவு வாசிக்கப்படுகிறது..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "தயவுசெய்து காத்திருக்கவும், பொதிகள் பட்டியலிடப்படுகிறது"
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "தயவுசெய்து காத்திருக்கவும்..இருக்கும் பொதிகளை கண்டுபிடிக்கப் படுகிறது"
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "சோதிக்கப்படுகிறது  %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "மாற்றங்கள்:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "நீக்கு  .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr ".%s என்பதை முக்கிய கோப்பாக பயன்படுத்து"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "ஒன்றும் செய்யாதே"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "நிறுவுதல் முடிந்தது"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "சோதிக்கப்படுகிறது..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "நீங்கள் கேட்ட அனைத்து பொதிகளும் வெற்றிகரமாக நிறுவப்பட்டது"
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
-#, fuzzy
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, fuzzy, c-format
 msgid "Problem during installation"
 msgstr "பொதி நிறுவலின் போது பிழை நேர்ந்துள்ளது"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, fuzzy, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, fuzzy, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1589,17 +2001,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "மூலப் பொதிகள் கிடைக்கவில்ைல"
 
-#: ../rpmdrake:1710
-#, fuzzy, perl-format
+#: ../rpmdrake:1902
+#, fuzzy, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "பொதிகளை நிறுவுவதற்கு நீங்கள் நிர்வாகியாக இருக்க வேண்டும்"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1611,69 +2024,85 @@ msgstr ""
 "பிழை ேநர்ந்துள்ளது:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"சில கட்டுப்பாடுகளினால் கீேழ ெகாடுக்கப்பட்டுள்ள பொதிகள் நிறுவப்பட \n"
+"வேண்டும்:\n"
+"\n"
+msgstr[1] ""
 "சில கட்டுப்பாடுகளினால் கீேழ ெகாடுக்கப்பட்டுள்ள பொதிகள் நிறுவப்பட \n"
 "வேண்டும்:\n"
 "\n"
 
-#: ../rpmdrake:1730
-#, fuzzy, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] " ெமன்ெபாருளை நீக்கவும்"
+msgstr[1] " ெமன்ெபாருளை நீக்கவும்"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"ேதர்ந்ெதடுத்துள்ள பொதிகளை நிறுவ இந்த பொதிகள் நீக்கப்படவேண்டும்:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"தொடர்ந்து செல்ல சம்மதமா?"
+msgstr[1] ""
 "ேதர்ந்ெதடுத்துள்ள பொதிகளை நிறுவ இந்த பொதிகள் நீக்கப்படவேண்டும்:\n"
 "\n"
 "%s\n"
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "துவக்கப்படுகிறது..."
-
-#: ../rpmdrake:1741
-#, fuzzy
-msgid "Package installation..."
-msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "தயவுசெய்து காத்திருக்கவும்.."
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"இப்படியே தொடரலாமா?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "ஊடகத்ைத மாற்றவும்"
 
-#: ../rpmdrake:1751
-#, fuzzy, perl-format
+#: ../rpmdrake:1945
+#, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr " \"%s\" என்ற ஊடகத்ைத [%s] என்ற சாதனத்தில் வைக்கவும்."
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "பின்வரும் பொதிகள்  இறக்கப்படுகிறது `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "எச்சரிக்ைக"
 
-#: ../rpmdrake:1794
-#, fuzzy, perl-format
+#: ../rpmdrake:1986
+#, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1687,12 +2116,13 @@ msgstr ""
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "நிறுவுதலில் பிழை நேர்ந்துள்ளது"
 
-#: ../rpmdrake:1804
-#, fuzzy, perl-format
+#: ../rpmdrake:1999
+#, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1702,27 +2132,28 @@ msgstr ""
 "நிறுவுதலில் பிழை நேர்ந்துள்ளது சில கோப்புகள் கானப்படவில்ைல.\n"
 "உங்கள் மூலத்தரவுகளை புதுப்பித்து பாருங்கள்"
 
-#: ../rpmdrake:1819
-#, fuzzy
+#: ../rpmdrake:2013
+#, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "பின்வரும் பொதி நிறுவப்படுகிறது  `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1734,34 +2165,48 @@ msgstr ""
 "சில வடிவமைப்புக் கோப்புகள்  `.rpmnew அல்லது rpmsave',\n"
 "என்ற பெயர்களில் உருவாக்கப்பட்டது. அவற்ைறப் பார்த்து தேவையான நடவடிக்கை எடுக்கவும்"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "சாதரன விவரம்"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "பொதிகளைப் பற்றிய மேலும் விவரங்கள்"
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "பொதிகளைப் பற்றிய மேலும் விவரங்கள்"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "பிழை"
 
-#: ../rpmdrake:1910
-#, fuzzy
+#: ../rpmdrake:2099
+#, fuzzy, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "தயவுசெய்து காத்திருக்கவும்...பொதிகள் நீக்கப்படுகின்றன..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "நீக்குதலில் பிழை நேர்ந்துள்ளது"
 
-#: ../rpmdrake:1947
-#, fuzzy, perl-format
+#: ../rpmdrake:2136
+#, fuzzy, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1771,11 +2216,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "வருக"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1787,8 +2234,8 @@ msgstr ""
 "இக்கருவி மூலம் தேவையில்லாத ெமன்ெபாருளை உங்கள் கணினியில் இருந்து\n"
 " நீக்க முடியும்"
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1800,11 +2247,13 @@ msgstr ""
 "இக்கருவி மூலம் உங்கள் கணினியில் உள்ள  ெமன்ெபாருளை நீங்கள் புதுப்பிக்க\n"
 " முடியும்"
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1817,177 +2266,213 @@ msgstr ""
 "இக்கருவி மூலம் தேவையான  ெமன்ெபாருளை உங்கள் கணினியில்\n"
 "நிறுவ முடியும்"
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "மாண்ட்ேரக் புதுப்பித்தல்"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "ெமன்ெபாருள் நீக்கம்"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "மாண்ட்ேரக் புதுப்பித்தல்"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "உங்கள் மின்னஞ்சல் முகவரியைத் தருக"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "பயனர் பெயர்:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "ெமன்ெபாருள் நீக்கம்"
 
-#: ../rpmdrake.pm:174
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "ெமன்ெபாருள் நீக்கம்"
 
-#: ../rpmdrake.pm:175
-#, fuzzy
+#: ../rpmdrake.pm:177
+#, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "இல்ைல"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "ஆம்"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "தகவல்..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "ஆஸ்திரியா"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "ஆஸ்திரேலியா"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "பெல்ஜியம்"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "பிரேசில்"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "கனடா"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "சுவிட்சர்லாந்து"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "கோஸ்டா ரிகா"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "செக் குடியரசு"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "ெஜர்மனி"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "டென்மார்க்"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "கிரேக்கம்"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "ஸ்ெபயின்"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "பின்லாந்து"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "பிரான்ஸ்"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "ஹங்கேரி"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "இஸ்ேரல்"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "இத்தாலி"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "ஜப்பான்"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "கொரியா"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "நெதர்லாந்து"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "நார்ேவ"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "போலாந்து"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "போர்சுகல்"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "ரஷ்யா"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "சுவிடன்"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "சிங்கப்பூர்"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "ஸ்ேலாேவகியா"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "தைவான்"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "பிரிட்டன்"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "சீனா"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "அமெரிக்கா"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1999,7 +2484,8 @@ msgstr ""
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2011,26 +2497,28 @@ msgstr ""
 "\n"
 "தொடர்ந்து செல்ல சம்மதமா?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "தயவுசெய்து காத்திருக்கவும்... இணைப்பதிப்பு விவரங்கள் இறக்கப்படுகிறது"
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "தயவுசெய்து காத்திருக்கவும்... இணைப்பதிப்பு விவரங்கள் இறக்கப்படுகிறது"
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "பொதியை இறக்குவதில் பிழை நேர்ந்துள்ளது"
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2045,7 +2533,7 @@ msgstr ""
 "பிரச்சினையிருக்கலாம்.தயவுசெய்து பிறகு முயற்சி செய்யவும்"
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2060,14 +2548,17 @@ msgstr ""
 "பிரச்சினையிருக்கலாம்.தயவுசெய்து பிறகு முயற்சி செய்யவும்"
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "இணைப்பதிப்பு ஏதுமில்ைல"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2082,63 +2573,68 @@ msgstr ""
 "பாருங்கள்"
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "தயவுசெய்து உங்களுக்கு அருகிலுள்ள இணைப்பதிப்ைப ேதர்ந்ெதடுங்கள்"
 
-#: ../rpmdrake.pm:639
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:634
+#, fuzzy, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "`%s'... என்ற மூலத்திற்கு ேகாப்பு நகலிடப்படுகிறது"
 
-#: ../rpmdrake.pm:642
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:637
+#, fuzzy, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "`%s'... என்ற நிரலின் மூலம் ஆராயப்படுகிறது"
 
-#: ../rpmdrake.pm:645
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:640
+#, fuzzy, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "`%s'... என்ற நிரலின் மூலம் ஆராயப்படுகிறது"
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr "முடிந்தது"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr "ெவற்றியடையவில்ைல"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:661
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:656
+#, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "பொதி கையெழுத்து சோதனையில் உள்ளது  `%s'.."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' இறக்கத்திற்கு, ேதவைப்படும் ேநரம்:%s, ேவகம்:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' இறக்கத்தின் ேவகம்:%s , "
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "தயவுசெய்து காத்திருக்கவும்.... ஊடகம் புதுப்பிக்கப்படுகிறது"
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2148,32 +2644,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
-#, fuzzy
+#: ../rpmdrake.pm:734
+#, fuzzy, c-format
 msgid "Update media"
 msgstr "புதுப்பிக்கப்பட வேண்டிய மூல(ங்கள்)"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
-#, fuzzy
+#: ../rpmdrake.pm:746
+#, fuzzy, c-format
 msgid "Select the media you wish to update:"
 msgstr "நீங்கள் புதுப்பிக்க விரும்புகிற  மூலங்களை தேர்வு செய்யவும்"
 
 #: ../rpmdrake.pm:764
-#, fuzzy
-msgid "Select all"
-msgstr "தேர்வு ெசய்யப்பட்டுள்ளது"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "புதுப்பிக்கவும்"
 
-#: ../rpmdrake.pm:789
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:785
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2181,25 +2674,26 @@ msgid ""
 "%s"
 msgstr "ஊடகத்ைத புதுப்பிக்க முடியவில்ைல,அது தானாகவே முடக்கப்படும்"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "ஊடகத்ைத உருவாக்க முடியவில்ைல"
 
-#: ../rpmdrake.pm:840
-#, fuzzy
+#: ../rpmdrake.pm:836
+#, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "தயவுசெய்து காத்திருக்கவும்.... புதிய ஊடகம் சேர்க்கப்படுகிறது"
 
-#: ../rpmdrake.pm:841
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:837
+#, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2209,27 +2703,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2505,20 +3001,21 @@ msgstr " ெமன்ெபாருளை நீக்கவும்"
 msgid "Software Media Manager"
 msgstr " ெமன்ெபாருள் மூலங்கள் மேலாளர்"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "தயவுசெய்து காத்திருக்கவும்...பொதித் தரவு வாசிக்கப்படுகிறது..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "டிேரக்ெமன்ெபாருள்"
+
 #, fuzzy
 #~ msgid "No package found for installation."
 #~ msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
 
-#~ msgid "Stop"
-#~ msgstr "நிறுத்து"
-
 #, fuzzy
 #~ msgid "All packages, by medium repository"
 #~ msgstr "மூலங்களின் இருப்புப்படி"
 
-#~ msgid "Normal information"
-#~ msgstr "சாதரன விவரம்"
-
 #~ msgid "Maximum information"
 #~ msgstr "அதிகபட்ச விவரம்"
 
@@ -2539,10 +3036,6 @@ msgstr " ெமன்ெபாருள் மூலங்கள் மேலா
 #~ msgid "Keys"
 #~ msgstr "விசைகள் "
 
-#, fuzzy
-#~ msgid "Rpmdrake %s"
-#~ msgstr "டிேரக்ெமன்ெபாருள்"
-
 #~ msgid "<no description>"
 #~ msgstr "<இவரிக்க வில்லை>"
 
diff --git a/po/th.po b/po/th.po
index af00a4d2..5a321270 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2002-11-27 21:43+0700\n"
 "Last-Translator: Varokas Panusuwan <varokasp@hotmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -17,12 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -36,17 +39,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "อัพเดททั่วไป"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -61,88 +65,104 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "กำลังอัพเดทสื่อข้อมูล, กรุณารอสักครู่"
 
-#: ../edit-urpm-sources.pl:134
-#, fuzzy
+#: ../edit-urpm-sources.pl:144
+#, fuzzy, c-format
 msgid "Add a medium"
 msgstr "เพิ่ม source: "
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "ไฟล์ในเครื่องนี้"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "พาธ:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "เซอร์เวอร์ FTP"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "๊URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "เซอร์เวอร์ FTP"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "เซอร์้เวอร์ HTTP"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "ที่อยู่หรือจุดเมาท์:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "ไดร์ฟเคลื่อนย้ายได้"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "ที่อยู่หรือจุดเมาท์:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "เลือก..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "ล็อกอิน:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "พาสเวิร์ด:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "พาธแบบ relative ไปยัง synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "เลือก source(s) ที่คุณต้องการจะอัพเดท"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "คุณต้องใส่ข้อมูลอย่างน้อยในสองช่องแรก"
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -150,323 +170,378 @@ msgstr ""
 "มีสื่อข้อมูลชื่อดังกล่าวอยู่แล้ว\n"
 "คุณต้องการจะเขียนทับหรือไม่?"
 
-#: ../edit-urpm-sources.pl:243
-#, fuzzy
+#: ../edit-urpm-sources.pl:252
+#, fuzzy, c-format
 msgid "Adding a medium:"
 msgstr "เพิ่ม source:"
 
-#: ../edit-urpm-sources.pl:245
-#, fuzzy
+#: ../edit-urpm-sources.pl:254
+#, fuzzy, c-format
 msgid "Type of medium:"
 msgstr "ชนิดของ source:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "การ install package"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:355
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "การลบเพกเกจ"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "กำลังเอาสื่อข้อมูลออก, กรุณารอสักครู่"
 
-#: ../edit-urpm-sources.pl:398
-#, fuzzy
+#: ../edit-urpm-sources.pl:405
+#, fuzzy, c-format
 msgid "Edit a medium"
 msgstr "แก้ไข source"
 
-#: ../edit-urpm-sources.pl:404
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:411
+#, fuzzy, c-format
 msgid "Editing medium \"%s\":"
 msgstr "กำลังแก้ไข source \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "คุณต้องใส่สื่อข้อมูลเพื่อทำต่อ"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "ถ้าคุณต้องการบันทึกการเปลี่ยนแปลง, คุณต้องใส่แผ่นข้อมูล"
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "ปรับแต่ง proxies"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, 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:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "ชื่อโฮส proxy:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "คุณต้องใส่ล็อกอินและพาสเวิร์ดเพื่อใช้ proxy:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "ผู้ใช้:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:565
-#, fuzzy
+#: ../edit-urpm-sources.pl:577
+#, fuzzy, c-format
 msgid "Add a medium limit"
 msgstr "เพิ่ม source: "
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:651
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:663
+#, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "กำลังแก้ไข source \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "ชื่อกลุ่ม:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "เพิ่ม"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "เอาออก"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "กลุ่ม"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "คำสั่ง"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(ไม่มี)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "แก้ไข"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "เพิ่ม..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "ปานกลาง"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:798
-#, fuzzy
+#: ../edit-urpm-sources.pl:816
+#, fuzzy, c-format
 msgid "Add a key"
 msgstr "เพิ่ม..."
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:838
-#, fuzzy
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "ปิด"
+
+#: ../edit-urpm-sources.pl:856
+#, fuzzy, c-format
 msgid "Remove a key"
 msgstr "ลบโปรแกรท"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-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:857
-#, fuzzy
+#: ../edit-urpm-sources.pl:875
+#, fuzzy, c-format
 msgid "Add a key..."
 msgstr "เพิ่ม..."
 
-#: ../edit-urpm-sources.pl:861
-#, fuzzy
+#: ../edit-urpm-sources.pl:879
+#, fuzzy, c-format
 msgid "Remove key"
 msgstr "เอาออก"
 
-#: ../edit-urpm-sources.pl:877
-#, fuzzy
+#: ../edit-urpm-sources.pl:895
+#, fuzzy, c-format
 msgid "Configure media"
 msgstr "ปรับแต่ง source"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "เปิดใช้?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "อัพเดท"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "เพิ่ม..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "อัพเดท..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "ความช่วยเหลือ"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -476,8 +551,8 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../edit-urpm-sources.pl:1033
-#, fuzzy
+#: ../edit-urpm-sources.pl:1054
+#, fuzzy, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -490,7 +565,8 @@ msgstr ""
 "เครื่องมือนี้จะช่วยคุณในการปรับแต่ง package sources ที่คุณจะใช้ในเครื่องคอมพิวเตอร์\n"
 "ของคุณ เพื่อที่เพกเกจเหล่านี้จะได้พร้อมสำหรับการ install หรืออัพเดทต่อไป"
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -498,652 +574,899 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-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
+#: ../gurpmi.addmedia:105
+#, c-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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "ให้ใช้: %s [ตัวเลือก]"
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
-#, fuzzy
+#: ../rpmdrake:45
+#, fuzzy, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr ""
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "ความสามารถในการใช้งาน"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Archiving"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "อัด Cd "
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "บีบอัด"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
-#, fuzzy
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, fuzzy, c-format
 msgid "Books"
 msgstr "อื่นๆ"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr ""
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr ""
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "บทประพันธ์"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "การสื่อสาร"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "ระบบฐานข้อมูล"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "พัฒนาโปรแกรม"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr ""
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "เคอร์เนล"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "แก้ไขข้อความ"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "การเรียนการสอน"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "อิมูเลเตอร์"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "File tools"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "เกมส์"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Adventure"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "เกมอาเขต"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "กระดาน"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "เกมไพ่ต่างๆ"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Puzzles"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "กีฬา"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "กลยุทธ์และวางแผน"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "กราฟิก"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Monitoring"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "มัลติมีเดีย"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "ระบบเครือข่าย"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "พูดคุย"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "การย้ายแฟ้ม"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Instant messaging"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "จดหมาย"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "ข่าว"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "ติดต่อทางไกล"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "โปรแกรมชุดสำนักงาน"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Publishing"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "วิทยาศาสตร์"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "ดาราศาสตร์"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biology"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "เคมี"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "วิทยาศาสตร์คอมพิวเตออร์"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geosciences"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "เลข"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "ฟิสิกซ์"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "ระบบเสียง"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "ระบบ"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "เลขฐาน"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "การปรับแต่ง"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Boot and Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "ฮาร์ดแวร์"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "จัดการแพ็คเกจ"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "ระบบการพิมพ์"
 
-#: ../rpmdrake:300
-#, fuzzy
+#: ../rpmdrake:317
+#, fuzzy, c-format
 msgid "Deploiement"
 msgstr "พัฒนาซอฟท์แวร์ (Development)"
 
-#: ../rpmdrake:301
-#, fuzzy
+#: ../rpmdrake:318
+#, fuzzy, c-format
 msgid "Deployment"
 msgstr "พัฒนาซอฟท์แวร์ (Development)"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "ฟอนส์"
 
-#: ../rpmdrake:303
-#, fuzzy
+#: ../rpmdrake:320
+#, fuzzy, c-format
 msgid "Console"
 msgstr "ปิด"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr ""
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr ""
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr ""
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr ""
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr ""
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr ""
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "โปรแกรมเทอร์มินัล"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "เครืองมือเขียน"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "ของเล่นสนุกๆ"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, fuzzy, c-format
+msgid "Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: ../rpmdrake:339
+#, fuzzy, c-format
+msgid "Console Tools"
+msgstr "ปิด"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "คู่มือ"
+
+#: ../rpmdrake:341
+#, fuzzy, c-format
+msgid "Game station"
+msgstr "Workstation ที่ทำงาน"
+
+#: ../rpmdrake:342
+#, fuzzy, c-format
+msgid "Internet station"
+msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
+
+#: ../rpmdrake:343
+#, fuzzy, c-format
+msgid "Multimedia station"
+msgstr "Multimedia - เขียน CD "
+
+#: ../rpmdrake:344
+#, fuzzy, c-format
+msgid "Network Computer (client)"
+msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Workstation ทางวิทยาศาสตร์"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "การทำงานแบบกราฟฟิก"
+
+#: ../rpmdrake:349
+#, fuzzy, c-format
+msgid "GNOME Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "พื้นที่ทำงาน"
+
+#: ../rpmdrake:351
+#, fuzzy, c-format
+msgid "KDE Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Graphical Desktops อื่นๆ"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "เซิร์ฟเวอร์"
+
+#: ../rpmdrake:357
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "ใช้ NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "ฐานข้อมูล"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr ""
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, fuzzy, c-format
+msgid "Network Computer server"
+msgstr "เครื่องพิมพ์ในระบบ Network (Socket)"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr ""
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(ไม่พร้อมใช้งาน)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "ผลการค้นหา"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "ผลการค้นหา (ไม่พบ)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "กำลังค้นหา กรุณารอสักครู่..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "เพิ่มได้"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Software Media Manager"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "หยุด"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "อัพเกรดได้"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "ไม่ได้ถูกเลือก"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "เพิ่มได้"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "ถูกเลือก"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "ไม่ได้ถูกเลือก"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "ความสำคัญ:"
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "เหตุผลในการอัพเดท:"
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "อัพเดทระบบรักษาความปลอดภัย"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "ไม่มีคำอธิบายรายละเอียด"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "แฟ้ม:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Changelog:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "แฟ้ม:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr ""
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "เวอร์ชันที่กำลังใช้อยู่:"
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "ชื่อ:"
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "เวอร์ชัน:"
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "ขนาด:"
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "ข้อความสรุป:"
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "คำอธิบาย:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Software Media Manager"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "ต้องการแพกเกจหนึ่งในรายชื่อนี้:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "กรุณาเลือก"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "ต้องการแพกเกจหนึ่งในรายชื่อนี้:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "กำลังทำรายชื่อเพกเกจ, กรุณารอสักครู่"
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "ไม่มีตัวอัพเดท"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1152,41 +1475,48 @@ msgstr ""
 "ไม่มีรายการที่ต้องอัพเดท หมายความว่าอาจจะยังไม่มีอัพเดทสำหรัับ\n"
 "เพกเกจที่อยู่ในเครื่องของคุณหรือไม่ก็ถูก install หมดแล้ว"
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "ทั้งหมด"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr ""
 
-#: ../rpmdrake:857 ../rpmdrake:1882
-#, fuzzy
+#: ../rpmdrake:964
+#, fuzzy, c-format
 msgid "Information on packages"
 msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "มีเพกเกจบางตัวยังต้องถูกเอาออก"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "เนื่องจาก dependencies จากเพจเกจเหล่านี้ ทำให้เพกเกจที่มีชื่อดังนี้ ต้องถูกลบออก:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "ไม่สามารถลบเพกเกจบางตัวออกได้"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1195,11 +1525,13 @@ msgstr ""
 "เนื่องจาก dependencies จากเพจเกจเหล่านี้ ทำให้ต้องเลือกออกตอนนี้:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "ต้องการเพจเกจเพิ่มเติม"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1208,137 +1540,158 @@ msgstr ""
 "เนื่องจาก dependencies, เพจเกจเหล่านี้จะต้อง install ไปด้วย:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "ไม่สามารถ install บางเพกเกจได้"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../rpmdrake:945
-#, fuzzy, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "เพกเกจเหล่านี้ไม่สามารถถูกเลือกได้:\n"
 "\n"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "เพกเกจบางตัวต้องถูกลบออก"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "เลือกไป: %s / พื้นที่ดิสก์ที่เหลือ: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "ขนาดรวมที่เลือก: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr ""
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Install"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Install"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux choices"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "ทุกเพกเกจ, เรียงตามตัวอักษร"
 
-#: ../rpmdrake:1061
-#, fuzzy
+#: ../rpmdrake:1175
+#, fuzzy, c-format
 msgid "All packages, by update availability"
 msgstr "ตามความพร้อมในการอัพเดท"
 
-#: ../rpmdrake:1062
-#, fuzzy
+#: ../rpmdrake:1176
+#, fuzzy, c-format
 msgid "All packages, by size"
 msgstr "ทุกเพกเกจ,"
 
-#: ../rpmdrake:1063
-#, fuzzy
+#: ../rpmdrake:1177
+#, fuzzy, c-format
 msgid "All packages, by selection state"
 msgstr "ตามการถูกเลือก"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1065
-#, fuzzy
+#: ../rpmdrake:1179
+#, fuzzy, c-format
 msgid "All packages, by group"
 msgstr "ทุกเพกเกจ,"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "อัพเดททั่วไป"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "อัพเดทระบบรักษาความปลอดภัย"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "อัพเดทแบบแก้ไขบัก"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "อัพเดททั่วไป"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "อัพเดทระบบรักษาความปลอดภัย"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "ในชื่อ"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "ตามคำอธิบาย"
 
-#: ../rpmdrake:1127
-#, fuzzy
+#: ../rpmdrake:1248
+#, fuzzy, c-format
 msgid "in file names"
 msgstr "ในไฟล์"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
-#, fuzzy
+#: ../rpmdrake:1279
+#, fuzzy, c-format
 msgid "You need to select some packages first."
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "มีเพกเกจที่ถูกเลือกมากเกินไป"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1353,137 +1706,171 @@ msgstr ""
 "\n"
 "คุณต้องการจะลงเพกเกจที่เลือกไว้ทั้งหมดหรือไม่?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_ไฟล์"
 
-#: ../rpmdrake:1191
-#, fuzzy
+#: ../rpmdrake:1320
+#, fuzzy, c-format
 msgid "/_Update media"
 msgstr "อัพเดท source(s)"
 
-#: ../rpmdrake:1201
-#, fuzzy
+#: ../rpmdrake:1331
+#, fuzzy, c-format
 msgid "/_Reset the selection"
 msgstr "reset รายชื่อที่ถูกเลือก"
 
-#: ../rpmdrake:1213
-#, fuzzy
+#: ../rpmdrake:1344
+#, fuzzy, c-format
 msgid "/Reload the _packages list"
 msgstr "โหลดรายชื่อเพจเกจใหม่"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_เลิก"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_ทางเลือก"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Software Media Manager"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
-#, fuzzy
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, fuzzy, c-format
 msgid "/_Show automatically selected packages"
 msgstr "  --อัตโนมัติ         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_ช่วยเหลือ"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_แจ้ง Bug"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_เกี่ยวกับ..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "ค้นหา:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "ค้นหา"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "ลบทั้งหมด"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, fuzzy, c-format
+msgid "Select all"
+msgstr "ถูกเลือก"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "มีผลทันที"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "ออก"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr ""
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "โปรดรอสักครู่"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, fuzzy, c-format
+msgid "Package installation..."
+msgstr "การ install package"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
 msgstr ""
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "การปรับแต่ง LAN"
+msgstr "ปรับแต่งค่า"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1495,13 +1882,13 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อไปหรือไม่?"
 
-#: ../rpmdrake:1378
-#, fuzzy
+#: ../rpmdrake:1543
+#, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "เกิดข้อผิดพลาดขณะกำลังเพื่มแผ่นข้อมูลอัพเดท"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1511,12 +1898,13 @@ msgid ""
 "Then, restart %s."
 msgstr ""
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "วิธีเลือก mirror ของคุณเอง"
 
-#: ../rpmdrake:1390
-#, fuzzy, perl-format
+#: ../rpmdrake:1556
+#, fuzzy, c-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"
@@ -1529,57 +1917,73 @@ msgstr ""
 "\n"
 "จากนั้น ก็ปิดแล้วเปิด Mandriva LinuxUpdate อีกครั้ง"
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "ตามคำอธิบาย"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "กำลังหาเพกเกจที่มีอยู่, กรุณารอสักครู่..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "กำลังอ่านจากฐานข้อมูลเพกเกจ, กรุณารอสักครู่..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "กำลังทำรายชื่อเพกเกจ, กรุณารอสักครู่"
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "กำลังหาเพกเกจที่มีอยู่, กรุณารอสักครู่..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "กำลังตรวจสอบ %s"
 
-#: ../rpmdrake:1607
-#, fuzzy
+#: ../rpmdrake:1797
+#, fuzzy, c-format
 msgid "changes:"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "ลบ %s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "ใช้ %s เป็นไฟล์หลักManager"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "ไม่ต้องทำอะไร"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "install เสร็จเรียบร้อย"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "ตรวจสอบ..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "เพกเกจทุกตัวที่เลือกไว้ถูก install เรียบร้อย"
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "เกิดปัญหาขณะ install"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1589,17 +1993,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
-#: ../rpmdrake:1710
-#, fuzzy, perl-format
+#: ../rpmdrake:1902
+#, fuzzy, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1607,68 +2012,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "เนื่องจาก dependencies, เพจเกจเหล่านี้จะต้อง install ไปด้วย:\n"
 "\n"
 
-#: ../rpmdrake:1730
-#, fuzzy, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "ลบโปรแกรท"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
 "เพกเกจเหล่านี้ต้องถูกลบออกเพื่อให้เพจเกจอื่นๆอัพเกรดได้:\n"
 "\n"
 "%s\n"
 "\n"
 "คุณต้องการทำต่อหรือไม่?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
 msgstr ""
+"%s\n"
+"\n"
+"คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../rpmdrake:1741
-#, fuzzy
-msgid "Package installation..."
-msgstr "การ install package"
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "โปรดรอสักครู่"
-
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "เปลื่ยนสื่อข้อมูล"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr ""
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../rpmdrake:1794
-#, fuzzy, perl-format
+#: ../rpmdrake:1986
+#, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1682,12 +2092,13 @@ msgstr ""
 "\n"
 "คุณต้องการทำต่อหรือไม่?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "install ไม่สำเร็จ"
 
-#: ../rpmdrake:1804
-#, fuzzy, perl-format
+#: ../rpmdrake:1999
+#, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1697,29 +2108,30 @@ msgstr ""
 "install ไม่สำเร็จ, ไฟล์บางไฟล์อยู่ไท่ครบ\n"
 "คุณอาจจะต้องอัพเดทฐานข้อมูล source ของคุณ"
 
-#: ../rpmdrake:1819
-#, fuzzy
+#: ../rpmdrake:2013
+#, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "การ install package"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "กำลังเตรียม..."
 
-#: ../rpmdrake:1822
-#, fuzzy, perl-format
+#: ../rpmdrake:2016
+#, fuzzy, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 "กำลังติดตั้งแพ็คเก็จ %s\n"
 "%d%%"
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1731,34 +2143,48 @@ msgstr ""
 "ไฟล์ configuration บางตัวถูกสร้างในชื่อ '.rpmnew' หรือ '.rpmsave', \n"
 "คุณอาจจะต้องตรวจสอบไฟล์เหล่านี้หากต้องการทำอย่างอื่นต่อไป"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "ข้อมูลแบบปกตื"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "ข้อมูลเพื่มเติมบนแพกเกจ..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr ""
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "กำลังลบเพกเกจ, กรุณารอสักครู่..."
 
-#: ../rpmdrake:1946
-#, fuzzy
+#: ../rpmdrake:2135
+#, fuzzy, c-format
 msgid "Problem during removal"
 msgstr "เกิดปัญหาขณะ install"
 
-#: ../rpmdrake:1947
-#, fuzzy, perl-format
+#: ../rpmdrake:2136
+#, fuzzy, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1768,11 +2194,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "ยินดีต้อนรับ"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1783,8 +2211,8 @@ msgstr ""
 "\n"
 "โปรแกรมนี้จะช่วยคุณในการเลือกโปรแกรมที่คุณต้องการลบออกจากเครื่อง"
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1795,11 +2223,13 @@ msgstr ""
 "\n"
 "โปรแกรมนี้จะช่วยคุณในการเลือกตัวอัพเดทที่คุณต้องการ install ลงในเครื่อง"
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1813,180 +2243,213 @@ msgstr ""
 "บน CDROM หรือ DVD  โปรแกรมนี้จะช่วยคุณเลือกว่าโปรแกรทไหนที่คุณต้องการ\n"
 "จะลงบนเครื่อง"
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "อัพเดทของ Mandriva Linux"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "การลบเพกเกจ"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "อัพเดทของ Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "กรุณาใส่ ประโยคลับสำหรับ %s@%s:"
 
-#: ../rpmdrake.pm:130
-#, fuzzy
+#: ../rpmdrake.pm:132
+#, fuzzy, c-format
 msgid "User name:"
 msgstr "ชื่อผู้ใช้:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "การลบเพกเกจ"
 
-#: ../rpmdrake.pm:174
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "การลบเพกเกจ"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "การ install package"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "ไม่ใช่"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "ใช่"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "ข้อมูล..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "ออสเตรีย"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "ออสเตรเลีย"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "เบลเยียม"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "บราซิล"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "แคนาดา"
 
-#: ../rpmdrake.pm:391
-#, fuzzy
+#: ../rpmdrake.pm:395
+#, fuzzy, c-format
 msgid "Switzerland"
 msgstr "เนเธอร์แลนด์"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "คอสตาริกา"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "สาธารณรัฐเช็ค"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "เยอรมนี"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "เดนมาร์ก"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "กรืซ"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "สเปน"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "ฟินแลนด์"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "ฝรั่งเศส"
 
-#: ../rpmdrake.pm:401
-#, fuzzy
+#: ../rpmdrake.pm:405
+#, fuzzy, c-format
 msgid "Hungary"
 msgstr "อังการี"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "อิสราเอล"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "อิตาลี"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "ญี่ปุ่น"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "เกาหลี"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "เนเธอร์แลนด์"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "นอร์เวย์"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "โปแลนด๋"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "โปรตุเกส"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "รัสเซีย"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "สวีเดน"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "สิงคโปร์"
 
-#: ../rpmdrake.pm:413
-#, fuzzy
+#: ../rpmdrake.pm:417
+#, fuzzy, c-format
 msgid "Slovakia"
 msgstr "สโลวาเนีย"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "ไต้หวัน"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "อังกฤษ"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "จีน"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "สหรัฐอเมริกา"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1998,7 +2461,8 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2010,26 +2474,28 @@ msgstr ""
 "\n"
 "คุณต้องการจะทำต่อหรือไม่?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "กรุณารอสักครุ่, กำลังดาว์นโหลดรายชื่อ mirrors จากเวป Mandriva"
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "กรุณารอสักครุ่, กำลังดาว์นโหลดรายชื่อ mirrors จากเวป Mandriva"
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "เกิดข้อผิดพลาดขณะดาวน์โหลด"
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2043,7 +2509,7 @@ msgstr ""
 "ระบบเนตเวิร์ก หรือ เวป Mandriva ในขณะนี้อาจจะไม่พร้อมให้บริการ กรุณาลองใหม่ภายหลัง"
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2057,14 +2523,17 @@ msgstr ""
 "ระบบเนตเวิร์ก หรือ เวป Mandriva ในขณะนี้อาจจะไม่พร้อมให้บริการ กรุณาลองใหม่ภายหลัง"
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "ไม่พบ mirror"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2078,64 +2547,68 @@ msgstr ""
 "หน่วยประมวลผลของคุณไม่ได้สนับสนุนโดย Mandriva Linux Offical Updates"
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "กรุณาเลือก mirror ที่ต้องการ"
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake.pm:653
-#, fuzzy
+#: ../rpmdrake.pm:648
+#, fuzzy, c-format
 msgid " failed!"
 msgstr "ในไฟล์"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr ""
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr ""
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr ""
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "กำลังอัพเดทสื่อข้อมูล, กรุณารอสักครู่"
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2145,32 +2618,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
-#, fuzzy
+#: ../rpmdrake.pm:734
+#, fuzzy, c-format
 msgid "Update media"
 msgstr "อัพเดท source(s)"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
-#, fuzzy
+#: ../rpmdrake.pm:746
+#, fuzzy, c-format
 msgid "Select the media you wish to update:"
 msgstr "เลือก source(s) ที่คุณต้องการจะอัพเดท"
 
 #: ../rpmdrake.pm:764
-#, fuzzy
-msgid "Select all"
-msgstr "ถูกเลือก"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "อัพเดท"
 
-#: ../rpmdrake.pm:789
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:785
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2178,25 +2648,26 @@ msgid ""
 "%s"
 msgstr "ไม่สามารถอัพเดทแผ่นข้อมูลได้; แผ่นข้อมูลนี้จะไม่ถูกใช้โดยอัตโนมัติ"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "ไม่สามารถสร้างแผ่นข้อมูลได้"
 
-#: ../rpmdrake.pm:840
-#, fuzzy
+#: ../rpmdrake.pm:836
+#, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "กำลังเพิ่มแผ่นข้อมูล, กรุณารอสักครู่"
 
-#: ../rpmdrake.pm:841
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:837
+#, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2206,27 +2677,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr ""
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2502,20 +2975,21 @@ msgstr "ลบโปรแกรท"
 msgid "Software Media Manager"
 msgstr "Software Media Manager"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "กำลังอ่านจากฐานข้อมูลเพกเกจ, กรุณารอสักครู่..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "rpmdrake"
+
 #, fuzzy
 #~ msgid "No package found for installation."
 #~ msgstr "การ install package"
 
-#~ msgid "Stop"
-#~ msgstr "หยุด"
-
 #, fuzzy
 #~ msgid "All packages, by medium repository"
 #~ msgstr "ตาม source repository"
 
-#~ msgid "Normal information"
-#~ msgstr "ข้อมูลแบบปกตื"
-
 #~ msgid "Maximum information"
 #~ msgstr "ข้อมูลแบบละเอียด"
 
@@ -2533,10 +3007,6 @@ msgstr "Software Media Manager"
 #~ msgid "Everything installed successfully"
 #~ msgstr "ทุกอย่างถูก install เรียบร้อย"
 
-#, fuzzy
-#~ msgid "Rpmdrake %s"
-#~ msgstr "rpmdrake"
-
 #~ msgid "<no description>"
 #~ msgstr "<ไม่มีคำอธิบายรายละเอียด>"
 
diff --git a/po/tr.po b/po/tr.po
index f8e8ac32..e540fb43 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,19 +12,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -38,17 +41,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "Normal güncellemeler"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -63,87 +67,104 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Lütfen bekleyin, medya güncelleniyor..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Bir medya ekle"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Yerel dosyalar"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Yol:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP sunucu"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP sunucu"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP sunucu"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Yol veya bağlama noktası:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Kaldırılabilinir aygıt"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Yol veya bağlama noktası:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Gözat..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Kullanıcı adı:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist'e göreli yol:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Adı:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "Güncellemek istediğiniz medyayı seçiniz:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "En azından İlk iki girişi doldurmak zorundasınız."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -151,115 +172,134 @@ msgstr ""
 "Aynı isme sahip bir başka ortam mevcut, onu\n"
 "değiştirmek ister misiniz?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Bir meyda ekleniyor:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Medya Türü:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "İptal"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Tamam"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Paket kurulumuna hazırlanılıyor..."
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "hiç"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Bazı paketler kurulamadı"
 
-#: ../edit-urpm-sources.pl:325
-#, fuzzy
+#: ../edit-urpm-sources.pl:334
+#, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "'%s' indirmesi , hız:%s"
 
-#: ../edit-urpm-sources.pl:355
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "Yazılım Paketleri Kaldırıcı"
 
-#: ../edit-urpm-sources.pl:356
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:365
+#, fuzzy, c-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:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Lütfen bekleyin, medya(kaynak) kaldırılıyor..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Bir medyayı düzenle"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" meydası düzenleniyor:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Vekil Sunucu..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Devam etmek için ortamı takmanız gerekli"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Vekil sunucuları yapılandır"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -267,139 +307,173 @@ msgstr ""
 "Eğer vekil sunucuya ihtiyacınız varsa makina adı ve isteğe bağlı olarak "
 "portu girin (<vekilsunucu[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Vekil sunucu adı:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Kullanıcı:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Bir paralel grup ekle"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Bir paralel grubu düzenle"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Bir medya sınırlaması ekle"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Bir makine Ekle"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr " \"%s\"ortak grubu düzenleniyor :"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Grup adı:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Medya sınırlaması:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Ekle"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Kaldır"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Makineler:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, 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:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Grup"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Medya sınırlaması"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Medya sınırlaması"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Komut"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Düzenle..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Ekle..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Paketlerin dijital imza anahtarlarını yönet"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Medya"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Bir anahtar ekle"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Kapat"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Bir anahtar kaldır"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -407,33 +481,38 @@ msgstr ""
 "%s anahtarını, %s kaynağından kaldırmak istediğinize emin misiniz?\n"
 "(Anahtarın adı: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Bir anahtar ekle..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Anahtarı Kaldır"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Medyayı yapılandır"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Etkin?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Güncelle"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -443,33 +522,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Ekle..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Güncelle..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Anahtarları Yönet"
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Parelel..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Yardım"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -479,7 +563,8 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı ?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -494,7 +579,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -506,12 +592,13 @@ msgstr ""
 "başka bir kaynak yöneticisi kullanıyor olabilirsiniz ya da\n"
 "yüklü paketler doğru olarak yüklenmemiş olabilir)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Ortam eklenemedi, yanlış ya da eksik bilgi"
 
-#: ../gurpmi.addmedia:101
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:102
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -521,8 +608,8 @@ 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:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -532,80 +619,94 @@ 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:129
-#, fuzzy, perl-format
+#: ../gurpmi.addmedia:130
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "`%s' ortamı başarıyla eklendi."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "`%s' ortamı başarıyla eklendi."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Kullanımı: %s [SEÇENEK]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Kullanıcı kipinde çalıştırılıyor"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -615,549 +716,784 @@ msgstr ""
 "Sistem üzerinde düzenlemeler yapamayacaksınız,\n"
 "fakat mevcut veri tabanına göz atabilirsiniz."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Erişilebilirlik"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Arşivleme"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Yedekleme"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Cd-yazımı"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Sıkıştırma"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Diğer"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Kitaplar"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Bilgisayar kitapları"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "SSS"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "NeNasıllar"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Edebiyat"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "İletişim"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Veritabanları"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Geliştirme"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ve GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE ve Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Çekirdek"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Düzenleyiciler"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Eğitim"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emülatörler"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Dosya araçları"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Oyunlar"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Macera"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Tahtalar"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Kartlar"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Bulmacalar"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Spor"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Strateji"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Grafiksel masaüstü"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "FVWM temelli"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Grafikler"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "İzleme"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Çoklu Ortam"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Ağ"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Muhabbet"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Dosya nakli"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Anında mesajlaşma"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Posta"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Haber"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Uzaktan erişim"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Ofis"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Yayınlama"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Fen"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Gökbilimi"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biyoloji"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Kimya"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Bilgisayar bilimi"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Yerbilimi"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematik"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizik"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Kabuklar"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Ses"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistem"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Temel"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Yapılandırma"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Açılış ve başlatma"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Donanım"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Paketleme"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Yazdırma"
 
-#: ../rpmdrake:300
-#, fuzzy
+#: ../rpmdrake:317
+#, fuzzy, c-format
 msgid "Deploiement"
 msgstr "Geliştirme"
 
-#: ../rpmdrake:301
-#, fuzzy
+#: ../rpmdrake:318
+#, fuzzy, c-format
 msgid "Deployment"
 msgstr "Geliştirme"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Yazı Tipleri"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Konsol"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Tür1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 Bitişlem"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Ulusallaştırma"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Çekirdek ve donanım"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Kütüphaneler"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Sunucular"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminaller"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Metin araçları"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Oyuncaklar"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "İş istasyonu"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Konsol Araçları"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Belgeler"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Oyun Konsolu"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Internet konsolu"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Çoklu ortam konsolu"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Ağ Makinası (client)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Ofis iş istasyonu"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Bilimsel İş istasyonu"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Grafik Ortamı"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME İş istasyonu"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Masaüstü"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE İş istasyonu"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Diğer Görsel Masaüstleri"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Sunucu"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Veritabanı"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Güvenlik Kalkanı/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Ağ Makinası sunucusu"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Erişilemez)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Arama sonuçları"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Arama sonuçları (hiçbiri)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Lütfen bekleyin, aranıyor..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Eklenebilir"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Yazılım Kaynak Yöneticisi"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Dur"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Güncellenebilinir"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Seçilmedi"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Eklenebilir"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Seçili"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Seçilmedi"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Önem: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Güncelleme nedeni: "
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Güvenlik güncellemeleri"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Tanımlanmamış"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Dosyalar:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Günlük:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Dosyalar:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Günlük:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Medya: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Kurulu olan sürüm: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Adı: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Sürümü: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Boyut: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Özet: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Tanım: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Yazılım Kaynak Yöneticisi"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Paket hakkında daha fazla bilgi..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Şu paketler birinin yüklenmesi gerekiyor:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Lütfen seçin"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Şu paketler birinin yüklenmesi gerekiyor:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Lütfen bekleyin, paketler listeleniyor..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Güncelleme yok"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1167,34 +1503,41 @@ msgstr ""
 "güncelleme olmadığı ya da bütün güncellemeleri yüklediğiniz anlamına\n"
 "gelir."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Hepsi"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Daha fazla bilgi"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Paket hakkında daha fazla bilgi"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Bazı ek paketlerin kaldırılması gerekiyor"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Bağımlılıkları nedeniyle şu paketlerinde kaldırlması gerekiyor:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Bazı paketler kaldırılamadı"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1202,7 +1545,8 @@ msgstr ""
 "Bu paketleri kaldırmak sisteminizin göçmesine sebeb olabilir, üzgünüm:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1211,11 +1555,13 @@ msgstr ""
 "Bağımlılıkları nedeniyle şu paketlerin seçili olmaması gerekiyor:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Ek paketlere ihtiyaç var"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1225,127 +1571,159 @@ msgstr ""
 "gerekiyor:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Bazı paketler kurulamadı"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Bazı paketler kurulamadı"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "Üzgünüm, bu paketleri seçemezsiniz:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Bazı paketlerin kaldırılması gerekiyor"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Seçili: %s / Diskteki boş alan: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Seçili boyut: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Bir ölümcül hata oluştu: %s."
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Kur"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Kur"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux seçimleri"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Tüm paketler, alfabetik"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Tüm paketler, güncellemesi mevcut olanlar"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Tüm paketler, boyuta göre"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Tüm paketler, seçim sırasına göre"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Tüm paketler, gruba göre"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Normal güncellemeler"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Güvenlik güncellemeleri"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Hata düzeltme güncellemeleri"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Normal güncellemeler"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Güvenlik güncellemeleri"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "isimlerde"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "tanımlarda"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "dosya isimlerinde"
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1275
+#, c-format
+msgid "Error: %s appears to be mounted read-only."
+msgstr ""
+
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Önce paket seçmelisin."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Aşırı fazla paket seçildi"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1360,133 +1738,171 @@ msgstr ""
 "\n"
 "Bütün seçili paketleri gerçekten yüklemek istiyor musunuz?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Medya güncelle"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Seçimi sıfırla"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/_Paket listesini yeniden yükle"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/Çı_k"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/S_eçenekler"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Yazılım Kaynak Yöneticisi"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Kendiliğinden seçilen paketleri göster"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Hata raporla"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_Hakkında..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Bul:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Ara"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Temizle"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, fuzzy, c-format
+msgid "Select all"
+msgstr "Seçili"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Uygula"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Çık"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Ölümcül hata"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Bir ölümcül hata oluştu: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Lütfen bekleyin"
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Paket Kurulumu..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Başlatılıyor..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "Yerel ağ ayarları"
+msgstr "Yapılandırma"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1498,12 +1914,13 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Bu güncelleme kaynağı zaten mevcut"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1519,12 +1936,13 @@ msgstr ""
 "\n"
 "Sonra %s'yi tekrar çalıştırın."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Yansınızı elle nasıl seçersiniz?"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1538,56 +1956,73 @@ msgstr ""
 "\n"
 "Sonra %s'yi tekrar çalıştırın."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "tanımlarda"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Lütfen bekleyin, paketler listeleniyor..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "%s inceleniyor"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "değişiklikler:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Kaldır .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Ana dosya olarak .%s kullan"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Birşey yapma"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Kurulum tamamlandı"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "İncele..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "İstenen paketler başarılı bir şekilde yüklendi."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Kurulum sırasında problem"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1597,17 +2032,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Kaynak paketleri alınamıyor."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "%s kaynak paketleri alınamadı, üzgünüm."
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1619,68 +2055,74 @@ msgstr ""
 "Hata(lar) rapor edildi:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "Bağımlılıkları korumak için, şu paketlerin de yüklenmesi\n"
 "gerekiyor:\n"
 "\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Bir anahtar kaldır"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
 "Diğerlerinin güncellenebilmesi için şu paketlerin kaldırılması gerekiyor:\n"
 "\n"
 "%s\n"
 "\n"
 "Devam edilsin mi?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Başlatılıyor..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Paket Kurulumu..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Lütfen bekleyin"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Devam etmek için herşey tamam mı ?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Ortam değiştir"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Lütfen [%s] aygıtına \"%s\" kaynağını yerleştirin."
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' paketi indiriliyor (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Paket imzaları kontrol ediliyor..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1694,12 +2136,13 @@ msgstr ""
 "\n"
 "Yüklemeye devam etmek istiyor musunuz?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Kurulum başarısız"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1711,26 +2154,28 @@ msgstr ""
 "\n"
 "Medya(kaynak) veritabanınızı güncellemek isteyebilirsiniz."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Paket kurulumuna hazırlanılıyor..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Hazırlanıyor..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "'%s' paketi kuruluyor ( %s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "rpm dosyasına [%s] erişilemiyor"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1742,34 +2187,49 @@ msgstr ""
 "'.rpmnew' veya '.rpmsave' olak bazı yapılandırma dosyaları oluşturuldu.\n"
 "Harekete geçmek için artık birkaçını inceleyebilirsiniz:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Normal bilgi"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "Paket hakkında daha fazla bilgi..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "Paket hakkında daha fazla bilgi..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Hata"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 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:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Lütfen bekleyin, paketler kaldırılıyor..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Kaldırım esnasında problem"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1779,11 +2239,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Hoşgeldiniz"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1795,8 +2257,8 @@ msgstr ""
 "Bu araç, bilgisayarınızdan kaldırmak istediğiniz uygulamaları seçmede size\n"
 "yardımcı olacak."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1808,11 +2270,13 @@ msgstr ""
 "Bu araç, bilgisayarınıza yüklemek istediğiniz güncellemeleri seçmede size\n"
 "yardımcı olacak."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1827,176 +2291,213 @@ msgstr ""
 "yazılımları\n"
 "seçmede size yardımcı olacak."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Güncelleme"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "Yazılım Paketleri Kaldırıcı"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Güncelleme"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Lütfen e-posta adresinizi aşağıya giriniz "
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Kullanıcı adı:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Yazılım Paketleri Kaldırıcı"
 
-#: ../rpmdrake.pm:174
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "Yazılım Paketleri Kaldırıcı"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Paket Kurulumu"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Hayır"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Evet"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Hakkında..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Avusturya"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Avusturalya"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Belçika"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brezilya"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "İsviçre"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Çek Cumhuriyeti"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Almanya"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Yunanistan"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "İspanya"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Fransa"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Macaristan"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "İsrail"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "İtalya"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Japonya"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Kore"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Hollanda"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norveç"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Polonya"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portekiz"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rusya"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "İsveç"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakya"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Birleşik Krallık"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Çin"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Birleşik Devletler"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2008,7 +2509,8 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2020,28 +2522,30 @@ msgstr ""
 "\n"
 "Devam etmek için herşey tamam mı?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Lütfen bekleyin, yansı adresleri Mandriva'un web sitesinden indiriliyor."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Lütfen bekleyin, yansı adresleri Mandriva'un web sitesinden indiriliyor."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "İndirme sırasında hata"
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2056,7 +2560,7 @@ msgstr ""
 "olabilir. Lütfen daha sonra tekrar deneyin."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2071,14 +2575,17 @@ msgstr ""
 "olabilir. Lütfen daha sonra tekrar deneyin."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Yansı yok"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2093,63 +2600,68 @@ msgstr ""
 "desteklenmemesidir."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Lütfen istediğiniz yansıyı seçin."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Dosya '%s' medyasından kopyalanıyor..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "'%s' medyasının dosyayı sınanıyor..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "'%s' uzak medyasının dosyası sınanıyor..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " tamamlandı."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " başarısız!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s kaynağından %s "
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "'%s' indirilmeye başlanıyor..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "'%s' indirmesi , kalan zaman:%s , hız:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "'%s' indirmesi , hız:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Lütfen bekleyin, medya güncelleniyor..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2159,30 +2671,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Medya Güncelle"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Güncellemek istediğiniz medyayı seçiniz:"
 
 #: ../rpmdrake.pm:764
-#, fuzzy
-msgid "Select all"
-msgstr "Seçili"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Güncelle"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2194,8 +2705,8 @@ msgstr ""
 "Hatalar:\n"
 "%s  "
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2205,16 +2716,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Ortam oluşturulamıyor."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Ortam eklenirken hata oluştu"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2224,27 +2737,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-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:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-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:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Yardım arkaplanda çalıştırıldı"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 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."
@@ -2519,21 +3034,22 @@ msgstr "Yazılımı Kaldır"
 msgid "Software Media Manager"
 msgstr "Yazılım Kaynak Yöneticisi"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Lütfen bekleyin, paket veritabanı okunuyor..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Kurulacak hiçbir paket bulunamadı."
 
-#~ 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"
 
@@ -2555,9 +3071,6 @@ msgstr "Yazılım Kaynak Yöneticisi"
 #~ msgid "Keys"
 #~ msgstr "Anahtarlar"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/_Görünüm"
 
diff --git a/po/uk.po b/po/uk.po
index 12b4147b..db0be03b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 09:56+0100\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +24,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Виберіть тип носія"
 
 #: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -51,15 +54,17 @@ msgstr ""
 "дистрибутиву. (Ви можете додати обидвох, але за два кроки.)"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Джерела дистрибутиву"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Офіційні поновлення"
 
 #: ../edit-urpm-sources.pl:97
-#, perl-format
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -79,85 +84,104 @@ msgstr ""
 "\n"
 "Продовжити?"
 
-#. because updates media do not provide media.cfg yet
 #: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Зачекайте, будь ласка, додається джерело..."
 
 #: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Add a medium"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Локальні файли"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Шлях:"
 
 #: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Сервер FTP"
 
 #: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:416
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
 #: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "Сервер RSYNC"
 
 #: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Сервер HTTP"
 
 #: ../edit-urpm-sources.pl:150
-msgid "Path or mount point:"
-msgstr "Шлях або точка монтування:"
-
-#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Змінний пристрій"
 
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Шлях або точка монтування:"
+
 #: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Переглянути..."
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Ім'я:"
 
-#: ../edit-urpm-sources.pl:197 ../edit-urpm-sources.pl:501 ../rpmdrake.pm:131
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../edit-urpm-sources.pl:202 ../edit-urpm-sources.pl:417
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Відносний шлях до synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Якщо залишити порожнім, synthesis/hdlist буде автоматично вивчено"
 
-#: ../edit-urpm-sources.pl:209
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Назва:"
 
-#: ../edit-urpm-sources.pl:217
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Створити джерело для всього дистрибутиву"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Пошук поновлень на носії"
 
-#: ../edit-urpm-sources.pl:238
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Вам потрібно заповнити хоча б два перші поля."
 
-#: ../edit-urpm-sources.pl:242
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -165,113 +189,132 @@ msgstr ""
 "Вже є джерело з такою назвою,\n"
 "Ви дійсно хочете його замінити?"
 
-#: ../edit-urpm-sources.pl:253
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Добавляється джерело:"
 
-#: ../edit-urpm-sources.pl:255
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Тип джерела:"
 
-#: ../edit-urpm-sources.pl:263 ../edit-urpm-sources.pl:338
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:453
-#: ../edit-urpm-sources.pl:518 ../edit-urpm-sources.pl:600
-#: ../edit-urpm-sources.pl:640 ../edit-urpm-sources.pl:698
-#: ../edit-urpm-sources.pl:837 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:1921 ../rpmdrake:1929 ../rpmdrake.pm:287 ../rpmdrake.pm:596
-#: ../rpmdrake.pm:681 ../rpmdrake.pm:754
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../edit-urpm-sources.pl:265 ../edit-urpm-sources.pl:340
-#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:508
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:639
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:763
-#: ../edit-urpm-sources.pl:830 ../edit-urpm-sources.pl:883
-#: ../edit-urpm-sources.pl:1032 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:977 ../rpmdrake:982 ../rpmdrake:1827 ../rpmdrake:1921
-#: ../rpmdrake:2068 ../rpmdrake.pm:122 ../rpmdrake.pm:227 ../rpmdrake.pm:289
-#: ../rpmdrake.pm:596
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "Гаразд"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Загальні налаштування для встановлення пакунків"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "завжди"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "ніколи"
 
-#: ../edit-urpm-sources.pl:334
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Перевірити пакунки, що буде встановлено:"
 
-#: ../edit-urpm-sources.pl:335
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Використовувати програму для звантаження:"
 
-#: ../edit-urpm-sources.pl:365
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Вилучення вихідних текстів"
 
-#: ../edit-urpm-sources.pl:366
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Ви впевнені, що хочете видалити джерело \"%s\"?"
 
-#: ../edit-urpm-sources.pl:371
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Зачекайте, будь ласка, видаляю джерело..."
 
-#: ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Редагувати джерело"
 
-#: ../edit-urpm-sources.pl:413
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Редагування джерела \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
 msgid "Downloader:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:430
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Зберегти зміни"
 
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:1019
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Проксі..."
 
-#: ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Вам потрібно вставити носія для продовження"
 
-#: ../edit-urpm-sources.pl:452
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Щоб зберегти зміни, Вам слід вставити джерело до пристрою"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Налаштувати проксі"
 
-#: ../edit-urpm-sources.pl:484
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Налаштування проксі для носія \"%s\""
 
-#: ../edit-urpm-sources.pl:485
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Загальні налаштування проксі"
 
-#: ../edit-urpm-sources.pl:487
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -279,142 +322,172 @@ msgstr ""
 "Якщо Вам потрібен проксі, введіть його назву і порт (необов'язково) "
 "(синтаксис: <назва[:порт]>):"
 
-#: ../edit-urpm-sources.pl:490
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Назва проксі:"
 
-#: ../edit-urpm-sources.pl:493
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Ви можете встановити користувача/пароль для аутентифікації проксі:"
 
-#: ../edit-urpm-sources.pl:496
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Користувач:"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Додати паралельну групу"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Редактувати паралельну групу"
 
-#: ../edit-urpm-sources.pl:579
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Додати обмеження джерел"
 
-#: ../edit-urpm-sources.pl:591
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Виберіть джерело, щоб додати в перелік джерел"
 
-#: ../edit-urpm-sources.pl:628
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Додати машину"
 
-#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Введіть назву або IP-адресу машини, щоб додати:"
 
-#: ../edit-urpm-sources.pl:665
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Редагування паралельної групи \"%s\":"
 
-#: ../edit-urpm-sources.pl:669
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Назва групи:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../edit-urpm-sources.pl:672
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Обмеження джерел:"
 
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Додати"
 
-#: ../edit-urpm-sources.pl:678 ../edit-urpm-sources.pl:685
-#: ../edit-urpm-sources.pl:743 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Вилучити"
 
-#: ../edit-urpm-sources.pl:679
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Машини:"
 
-#: ../edit-urpm-sources.pl:713
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Налаштувати паралельний urpmi (розподілене виконання urpmi)"
 
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Група"
 
-#: ../edit-urpm-sources.pl:716
-msgid "Media limit"
-msgstr "Обмеження джерел"
-
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../edit-urpm-sources.pl:717
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Обмеження джерел"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:727 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:886 ../rpmdrake:1748
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(нічого)"
 
-#: ../edit-urpm-sources.pl:747 ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Редагувати"
 
-#: ../edit-urpm-sources.pl:755 ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Додати..."
 
-#: ../edit-urpm-sources.pl:771
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Керування ключами для цифрових підписів пакунків"
 
-#: ../edit-urpm-sources.pl:775 ../edit-urpm-sources.pl:932
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Джерело"
 
 #: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Ключі"
 
-#: ../edit-urpm-sources.pl:799
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "назви не знайдено, ключа немає в схованці rpm!"
 
-#: ../edit-urpm-sources.pl:812
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Додати ключ"
 
-#: ../edit-urpm-sources.pl:824
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Виберіть ключ, щоб додавати в джерело %s"
 
-#: ../edit-urpm-sources.pl:833
+#: ../edit-urpm-sources.pl:834
+#, c-format
 msgid "Close"
 msgstr "Закрити"
 
-#: ../edit-urpm-sources.pl:855
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Видалити ключ"
 
-#: ../edit-urpm-sources.pl:853
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -422,32 +495,38 @@ msgstr ""
 "Ви впевнені, що хочете видалити ключ %s з джерела %s?\n"
 "(назва ключа: %s)"
 
-#: ../edit-urpm-sources.pl:871
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Додати ключ..."
 
-#: ../edit-urpm-sources.pl:875
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Вилучити ключ"
 
-#: ../edit-urpm-sources.pl:891
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Сконфігурувати джерело"
 
-#: ../edit-urpm-sources.pl:930
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Доступний?"
 
-#: ../edit-urpm-sources.pl:931
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Поновлення?"
 
-#: ../edit-urpm-sources.pl:947
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Цей носій потрібно поновити. Зробити це зараз?"
 
-#: ../edit-urpm-sources.pl:977
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -457,32 +536,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1011
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Додати вказаний..."
 
-#: ../edit-urpm-sources.pl:1015
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Поновити..."
 
-#: ../edit-urpm-sources.pl:1018
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Керування ключами..."
 
-#: ../edit-urpm-sources.pl:1020
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Паралельний..."
 
-#: ../edit-urpm-sources.pl:1021
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Загальні налаштування..."
 
-#: ../edit-urpm-sources.pl:1031 ../rpmdrake:1428
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Довідка"
 
-#: ../edit-urpm-sources.pl:1047 ../gurpmi.addmedia:98 ../rpmdrake:2144
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -492,7 +577,8 @@ msgstr ""
 "\n"
 "Все гаразд? Продовжувати?"
 
-#: ../edit-urpm-sources.pl:1050
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -507,7 +593,8 @@ msgstr ""
 "доступними для встановлення нових пакунків з програмами\n"
 "або для здійснення поновлень."
 
-#: ../edit-urpm-sources.pl:1063
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -519,11 +606,12 @@ msgstr ""
 "іншій стільниці, або Ви в даний момент встановлюєте пакунки)."
 
 #: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Неможливо додати носія, неправильні або відсутні аргументи"
 
 #: ../gurpmi.addmedia:102
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -534,7 +622,7 @@ msgstr ""
 "в систему з цього нового носія."
 
 #: ../gurpmi.addmedia:105
-#, perl-format
+#, c-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"
@@ -545,21 +633,22 @@ msgstr ""
 "в систему з цього нового носія."
 
 #: ../gurpmi.addmedia:130
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "Успішно додано носій `%s'."
 
 #: ../gurpmi.addmedia:131
-#, perl-format
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Успішно додано носій `%s'."
 
 #: ../rpmdrake:39
-#, perl-format
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Використання: %s [ПАРАМЕТР]..."
 
 #: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -568,36 +657,43 @@ msgstr ""
 "файлів"
 
 #: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     обмежити вказаним носієм"
 
 #: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     об'єднувати всі знайдені файли  .rpmnew/.rpmsave"
 
 #: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            встановити режим (встановити (типово), вилучити, "
 "поновити)"
 
 #: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      не запитувати підтвердження в режимі поновлення"
 
 #: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      не поновлювати носія при запуску"
 
 #: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        не перевіряти підписи пакунків"
 
 #: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -606,26 +702,32 @@ msgstr ""
 "групу \"alias\", машину \"host\" для показу необхідних залежностей"
 
 #: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    показувати тільки ці пакунки"
 
 #: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      попередньо вибрати ці пакунки"
 
 #: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 виконати як root"
 
 #: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           виконати пошук для \"pkg\""
 
 #: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Виконання в режимі користувача"
 
 #: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -636,70 +738,86 @@ msgstr ""
 "але зможете переглядати існуючу базу даних."
 
 #: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Доступність"
 
 #: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
 #: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Архівування"
 
 #: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Резервування"
 
 #: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Записування КД"
 
 #: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Стиснення"
 
 #: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
 #: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
 #: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Інше"
 
 #: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
 #: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Книжки"
 
 #: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Книжки про комп'ютери"
 
 #: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Часті питання"
 
 #: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Як зробити"
 
 #: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Література"
 
 #: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Кластер"
 
 #: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Проходження повідомлення"
 
 #: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Послуги низок"
 
 #: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Засоби зв'язку"
 
 #: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Бази даних"
 
@@ -707,245 +825,302 @@ msgstr "Бази даних"
 #: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
 #: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Розробка"
 
 #: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "Сі"
 
 #: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "Сі++"
 
 #: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "Гноме і GTK+"
 
 #: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Ява"
 
 #: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE і Qt"
 
 #: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Ядро"
 
 #: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Перл"
 
 #: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
 #: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Пітон"
 
 #: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Редактори"
 
 #: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Освіта"
 
 #: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Емулятори"
 
 #: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Файлові інструменти"
 
 #: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
 #: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
 #: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Забавки"
 
 #: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Пригоди"
 
 #: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Аркади"
 
 #: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "На дошці"
 
 #: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Карти"
 
 #: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Головоломки"
 
 #: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Спорт"
 
 #: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Стратегії"
 
 #: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
 #: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
 #: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Графічна стільниця"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "Оснований на FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
 #: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Графіка"
 
 #: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Контроль"
 
 #: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Мультимедія"
 
 #: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Відео"
 
 #: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
 #: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
 #: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Робота в мережі"
 
 #: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Балачка"
 
 #: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Переміщення файлів"
 
 #: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
 #: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Прямі повідомлення"
 
 #: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Пошта"
 
 #: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Новини"
 
 #: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Віддалений доступ"
 
 #: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
 #: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Офіс"
 
 #: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Загальні ключі"
 
 #: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Видавництво"
 
 #: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
 #: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
 #: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Науки"
 
 #: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Астрономія"
 
 #: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Біологія"
 
 #: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Хімія"
 
 #: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Наука про комп'ютер"
 
 #: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Науки про Землю"
 
 #: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Математика"
 
 #: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Фізика"
 
 #: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Командні оболонки"
 
 #: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Звук"
 
@@ -955,326 +1130,391 @@ msgstr "Звук"
 #: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
 #: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
 #: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Система"
 
 #: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Основа"
 
 #: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
 #: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Конфігурація"
 
 #: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Завантаження та ініціалізація"
 
 #: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Залізо"
 
 #: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Створення пакунків"
 
 #: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Друкування"
 
 #: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Розгортання"
 
 #: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Розгортання"
 
 #: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
 #: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Шрифти"
 
 #: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Консоль"
 
 #: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
 #: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
 #: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "Матриця X11"
 
 #: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Інтернаціоналізація"
 
 #: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Ядро і залізо"
 
 #: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Бібліотеки"
 
 #: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Сервери"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
 #: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Термінали"
 
 #: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Інструменти для текстів"
 
 #: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Іграшки"
 
-#. for Mandriva Choice:
 #: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
 #: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
 #: ../rpmdrake:345 ../rpmdrake:346
-#, fuzzy
+#, c-format
 msgid "Workstation"
-msgstr "Конфіґурація локальної мережі"
+msgstr "Робоча станція"
 
 #: ../rpmdrake:339
-#, fuzzy
+#, c-format
 msgid "Console Tools"
-msgstr "Консоль"
+msgstr "Засоби для консолі"
 
 #: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
 msgid "Documentation"
-msgstr ""
+msgstr "Документація"
 
 #: ../rpmdrake:341
+#, c-format
 msgid "Game station"
-msgstr ""
+msgstr "Ігрова станція"
 
 #: ../rpmdrake:342
-#, fuzzy
+#, c-format
 msgid "Internet station"
-msgstr "Інтернаціоналізація"
+msgstr "Станція для Інтернету"
 
 #: ../rpmdrake:343
-#, fuzzy
+#, c-format
 msgid "Multimedia station"
-msgstr "Мультимедія"
+msgstr "Мультимедійна станція"
 
 #: ../rpmdrake:344
-#, fuzzy
+#, c-format
 msgid "Network Computer (client)"
-msgstr "Наука про комп'ютер"
+msgstr "Мережевий Комп'ютер (клієнт)"
 
 #: ../rpmdrake:345
+#, c-format
 msgid "Office Workstation"
-msgstr ""
+msgstr "Офісна робоча станція"
 
 #: ../rpmdrake:346
+#, c-format
 msgid "Scientific Workstation"
 msgstr ""
 
 #: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Graphical Environment"
-msgstr "Графічна стільниця"
+msgstr "Графічне середовище"
 
 #: ../rpmdrake:349
+#, c-format
 msgid "GNOME Workstation"
-msgstr ""
+msgstr "Робоча станція Gnome"
 
 #: ../rpmdrake:350
+#, fuzzy, c-format
 msgid "IceWm Desktop"
-msgstr ""
+msgstr "Стільниця Plucker"
 
 #: ../rpmdrake:351
+#, c-format
 msgid "KDE Workstation"
-msgstr ""
+msgstr "Робоча станція KDE"
 
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Other Graphical Desktops"
-msgstr "Графічна стільниця"
+msgstr "Інші робочі середовища"
 
 #: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
 #: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
 msgid "Server"
 msgstr "Сервер"
 
 #: ../rpmdrake:357
+#, c-format
 msgid "DNS/NIS"
-msgstr ""
+msgstr "DNS/NIS"
 
 #: ../rpmdrake:358
-#, fuzzy
+#, c-format
 msgid "Database"
-msgstr "Бази даних"
+msgstr "База даних"
 
 #: ../rpmdrake:359
+#, c-format
 msgid "Firewall/Router"
-msgstr ""
+msgstr "Захисний шлюз/Маршрутизатор"
 
 #: ../rpmdrake:361
+#, c-format
 msgid "Mail/Groupware/News"
 msgstr ""
 
 #: ../rpmdrake:362
-#, fuzzy
+#, c-format
 msgid "Network Computer server"
-msgstr "Наука про комп'ютер"
+msgstr "Мережевий комп'ютер (сервер)"
 
 #: ../rpmdrake:363
+#, c-format
 msgid "Web/FTP"
-msgstr ""
+msgstr "Тенета/FTP"
 
-#. - to highlight information
-#: ../rpmdrake:502 ../rpmdrake:707 ../rpmdrake:712 ../rpmdrake:726
-#: ../rpmdrake:728
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Недоступне)"
 
-#: ../rpmdrake:534
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Результати пошуку"
 
 #: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Результат пошуку (немає)"
 
-#: ../rpmdrake:545 ../rpmdrake:2125
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Зачекайте, будь ласка, шукаю..."
 
-#: ../rpmdrake:617 ../rpmdrake:921
-msgid "Addable"
-msgstr "Можливо додати"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Менеджер джерел програм"
 
-#: ../rpmdrake:617 ../rpmdrake:921
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Зупинити"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Можливо поновити"
 
-#: ../rpmdrake:619
-msgid "Not selected"
-msgstr "Не вибрано"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Можливо додати"
 
 #: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Вибрано"
 
-#. is it an update?
-#: ../rpmdrake:687 ../rpmdrake:744
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Не вибрано"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Важливість: "
 
-#: ../rpmdrake:688 ../rpmdrake:752
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Причина поновлення: "
 
-#: ../rpmdrake:692
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Поновлення безпеки"
 
-#: ../rpmdrake:700 ../rpmdrake:754
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Немає опису"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Файли:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Перелік змін:"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Файли:\n"
 
-#: ../rpmdrake:728
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Перелік змін:\n"
 
-#: ../rpmdrake:733 ../rpmdrake.pm:807
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Джерело:"
 
-#: ../rpmdrake:734
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Встановлена версія: "
 
-#: ../rpmdrake:738
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Назва: "
 
-#: ../rpmdrake:739
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Версія: "
 
-#: ../rpmdrake:740
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Архітектура: "
 
-#: ../rpmdrake:741
-#, perl-format
-msgid "%s KB"
-msgstr "%s кб"
-
-#: ../rpmdrake:741
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Розмір: "
 
-#. extra empty line
-#: ../rpmdrake:748
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s кб"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Підсумок: "
 
-#: ../rpmdrake:754
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Опис: "
 
-#: ../rpmdrake:810 ../rpmdrake.pm:179
-#, fuzzy
-msgid "Software Management"
-msgstr "Менеджер джерел програм"
-
-#: ../rpmdrake:827 ../rpmdrake:973 ../rpmdrake:975
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Більше інформації про пакунок..."
 
-#: ../rpmdrake:829
-msgid "One of the following packages is needed:"
-msgstr "Потрібний один з наступних пакунків:"
-
-#: ../rpmdrake:829
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Будь ласка, виберіть"
 
-#: ../rpmdrake:870
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Потрібний один з наступних пакунків:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Зачекайте, будь ласка, створюю перелік пакунків..."
 
-#: ../rpmdrake:888
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Немає поновлень"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1284,24 +1524,29 @@ msgstr ""
 "поновлень для пакунків, які встановлені на Вашому комп'ютері,\n"
 "або вони всі вже встановлені."
 
-#: ../rpmdrake:912 ../rpmdrake:1174
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Всі"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:960 ../rpmdrake:965
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Більше інформації"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Інформація про пакунки"
 
-#: ../rpmdrake:991
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Потрібно додатково вилучити деякі пакунки"
 
-#: ../rpmdrake:992
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1309,11 +1554,13 @@ msgstr ""
 "В зв'язку з необхідністю задоволення всіх залежностей наступні пакунки "
 "будуть вилучені:"
 
-#: ../rpmdrake:998 ../rpmdrake:1007
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Деякі пакунки неможливо вилучити"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1321,7 +1568,8 @@ msgstr ""
 "Вибачте, але вилучення цих пакунків порушить роботу Вашої системи:\n"
 "\n"
 
-#: ../rpmdrake:1008 ../rpmdrake:1073
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1331,11 +1579,13 @@ msgstr ""
 "скасований:\n"
 "\n"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Потрібні додаткові пакунки"
 
-#: ../rpmdrake:1038
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1345,137 +1595,159 @@ msgstr ""
 "наступні пакунки:\n"
 "\n"
 
-#: ../rpmdrake:1053
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (відноситься до списку пропущеного)"
 
-#: ../rpmdrake:1056
-msgid "Some packages can't be installed"
-msgstr "Деякі пакунки не можуть бути встановлені"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Деякі пакунки не можуть бути встановлені"
 
-#: ../rpmdrake:1057
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "Вибачте, наступні пакунки не можуть бути вибрані:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:1072 ../rpmdrake:1896
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Деякі пакунки повинні бути видалені"
 
-#: ../rpmdrake:1101
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Вибрано: %s / Вільно на диску: %s"
 
-#: ../rpmdrake:1102
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Розмір вибраного: %d Мб"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:1107
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Немає опису цього пакунку\n"
 
-#: ../rpmdrake:1113 ../rpmdrake:1506
-#, perl-format
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Сталася невиправна помилка: %s"
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Встановити"
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Встановити"
 
-#: ../rpmdrake:1175
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s вибирає"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Вибір Мандріва Лінакса"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1177
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Всі пакунки за абеткою"
 
-#: ../rpmdrake:1178
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Всі пакунки, за придатністю до поновлення"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Всі пакунки, за розміром"
 
-#: ../rpmdrake:1180
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Всі пакунки, за станом вибору"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Тільки ті, що залишилися, відсортовані за датою встановлення"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Всі пакунки, за групою"
 
-#: ../rpmdrake:1184
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Звичайні поновлення"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Поновлення безпеки"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Поновлення виявлених дефектів"
 
-#: ../rpmdrake:1184
-msgid "Normal updates"
-msgstr "Звичайні поновлення"
-
-#: ../rpmdrake:1184
-msgid "Security updates"
-msgstr "Поновлення безпеки"
+#: ../rpmdrake:1181
+#, c-format
+msgid "Normal updates"
+msgstr "Звичайні поновлення"
 
-#: ../rpmdrake:1247
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "в назвах"
 
-#: ../rpmdrake:1249
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "в описах"
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "у назвах файлів"
 
-#: ../rpmdrake:1278
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Помилка: схоже, %s змонтовано в режимі тільки читання."
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Спочатку Вам необхідно вибрати якісь пакунки."
 
-#: ../rpmdrake:1287
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Вибрано занадто багато пакунків"
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1285
+#, 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,143 +1763,171 @@ msgstr ""
 "\n"
 "Ви дійсно хочете встановити всі вибрані пакунки?"
 
-#: ../rpmdrake:1320 ../rpmdrake:1323 ../rpmdrake:1334 ../rpmdrake:1347
-#: ../rpmdrake:1356
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/Файл"
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/Оновити джерела"
 
-#: ../rpmdrake:1334
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/Скасувати вибір"
 
-#: ../rpmdrake:1347
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Перевантажити перелік пакунків"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/Вийти"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1359 ../rpmdrake:1360 ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/Параметри"
 
-#: ../rpmdrake:1360
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Менеджер джерел програм"
 
-#: ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Показувати автоматично вибрані пакунки"
 
-#: ../rpmdrake:1367 ../rpmdrake:1368 ../rpmdrake:1369 ../rpmdrake:1370
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/Довідка"
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_R Повідомити про помилку"
 
-#: ../rpmdrake:1370
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/Про..."
 
-#. nicer formatting
-#: ../rpmdrake:1373
-#, fuzzy
+#: ../rpmdrake:1370
+#, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:1375
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1377
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1379
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1384
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1408
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Знайти:"
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Пошук"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Очистити"
 
-#: ../rpmdrake:1433 ../rpmdrake.pm:758
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
 msgid "Select all"
 msgstr "Вибрати все"
 
-#: ../rpmdrake:1440
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Застосувати"
 
-#: ../rpmdrake:1444
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1461
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1462
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1463
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
 #: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Невиправна помилка"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
-msgid "Initializing..."
-msgstr "Встановлюю..."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Зачекайте, будь ласка"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
 msgid "Package installation..."
 msgstr "Встановлюються пакунки..."
 
-#: ../rpmdrake:1507 ../rpmdrake:1932 ../rpmdrake.pm:311
-msgid "Please wait"
-msgstr "Зачекайте, будь ласка"
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Встановлюю..."
 
-#: ../rpmdrake:1530 ../rpmdrake:1918
-#, fuzzy
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "Конфіґурація локальної мережі"
+msgstr "Конфігурація"
 
-#: ../rpmdrake:1532
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1640,12 +1940,13 @@ msgstr ""
 "\n"
 "Продовжити?"
 
-#: ../rpmdrake:1541
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Вже існуючі джерела поновлення"
 
-#: ../rpmdrake:1542
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1660,12 +1961,13 @@ msgstr ""
 "\n"
 "Після цього перезапустіть %s."
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Як вибрати дзеркало вручну"
 
-#: ../rpmdrake:1554
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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,67 +1981,73 @@ msgstr ""
 "\n"
 "Потім перезапустіть %s."
 
-#: ../rpmdrake:1567
-#, fuzzy
+#: ../rpmdrake:1570
+#, fuzzy, c-format
 msgid "Reading updates description"
 msgstr "в описах"
 
-#: ../rpmdrake:1593 ../rpmdrake:1670
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Будь ласка, зачекайте, шукаю доступні пакунки..."
 
-#: ../rpmdrake:1601
-#, fuzzy
+#: ../rpmdrake:1604
+#, fuzzy, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Зачекайте, будь ласка, створюю перелік пакунків..."
 
-#: ../rpmdrake:1637
-#, fuzzy
+#: ../rpmdrake:1640
+#, fuzzy, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Будь ласка, зачекайте, шукаю доступні пакунки..."
 
-#: ../rpmdrake:1771
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Вивчення %s"
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "зміни:"
 
-#: ../rpmdrake:1780
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Вилучити .%s"
 
-#: ../rpmdrake:1784
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Використовувати .%s як головний файл"
 
-#: ../rpmdrake:1788
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Нічого не робити"
 
-#: ../rpmdrake:1804
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Встановлення завершено"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Вивчаю..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1852 ../rpmdrake:2045
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Всі вибрані пакунки було успішно встановлено."
 
-#: ../rpmdrake:1856 ../rpmdrake:2025
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Помилка під час встановлення"
 
-#: ../rpmdrake:1857 ../rpmdrake:2026 ../rpmdrake:2084
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1749,17 +2057,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1876
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Неможливо отримати джерело з пакунками."
 
-#: ../rpmdrake:1877
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Вибачте, неможливо отримати джерело з пакунками. %s"
 
-#: ../rpmdrake:1878 ../rpmdrake:1976
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1771,61 +2080,74 @@ msgstr ""
 "Повідомлено про помилки:\n"
 "%s"
 
-#: ../rpmdrake:1894
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "Наступні %d пакунків буде встановлено для того, щоб задовольнити "
 "залежності:\n"
 " %s\n"
 
-#: ../rpmdrake:1898
-#, fuzzy, perl-format
-msgid "Remove %d packages?"
-msgstr "Видалити ключ"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Видалити ключ"
 
-#: ../rpmdrake:1899
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Наступні пакунки повинні бути видалені, щоб інші можна було поновити:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Продовжити?"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
 msgstr ""
-"Наступні пакунки повинні бути видалені, щоб інші можна було поновити:\n"
-"\n"
 "%s\n"
 "\n"
-"Продовжити?"
+"Все гаразд? Продовжувати?"
 
-#: ../rpmdrake:1941
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Змініть носія"
 
-#: ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Будь ласка, вставте диск з назвою \"%s\" у пристрій [%s]"
 
-#: ../rpmdrake:1927
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Звантажую пакунок '%s' (%s/%s)..."
 
-#: ../rpmdrake:1947
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Перевіряються підписи пакунків..."
 
-#: ../rpmdrake:1960 ../rpmdrake.pm:737 ../rpmdrake.pm:846
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Попередження"
 
-#: ../rpmdrake:1961
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1839,12 +2161,13 @@ msgstr ""
 "\n"
 "Ви хочете продовжити встановлення?"
 
-#: ../rpmdrake:1973 ../rpmdrake:2083
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Встановлення невдале"
 
-#: ../rpmdrake:1974
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1856,25 +2179,28 @@ msgstr ""
 "\n"
 "Можливо, Вам потрібно поновити базу даних джерел."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Підготовлюються пакунки до встановлення..."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Підготовка..."
 
-#: ../rpmdrake:1991
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Встановлюється пакунок '%s' (%s/%s)..."
 
-#: ../rpmdrake:2006
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "неможливо отримати доступ до файла [%s]"
 
-#: ../rpmdrake:2040
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1886,43 +2212,48 @@ msgstr ""
 "Деякі конфігураційні файли були створені як '.rpmnew' або '.rmpsave',\n"
 "Ви можете ретельно переглянути їх для подальших дій:"
 
-#: ../rpmdrake:2048
-#, fuzzy
+#: ../rpmdrake:2073
+#, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "Стандартна інформація"
 
-#: ../rpmdrake:2050
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Ці пакунки містять інформацію про поновлення"
 
-#: ../rpmdrake:2058
-#, fuzzy
+#: ../rpmdrake:2083
+#, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "Більше інформації про пакунок..."
 
-#: ../rpmdrake:2061
-#, fuzzy, perl-format
+#: ../rpmdrake:2086
+#, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "Більше інформації про пакунок... [%s]"
 
-#: ../rpmdrake:2073 ../rpmdrake.pm:724 ../rpmdrake.pm:805 ../rpmdrake.pm:829
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Помилка"
 
-#: ../rpmdrake:2074
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Невиправна помилка: на жаль, пакунку для встановлення не знайдено."
 
-#: ../rpmdrake:2099
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Зачекайте, будь ласка, поки rpm вилучає ці пакунки..."
 
-#: ../rpmdrake:2110
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Проблема під час вилучення"
 
-#: ../rpmdrake:2111
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1932,11 +2263,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2143
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Ласкаво просимо!"
 
-#: ../rpmdrake:2148
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1948,8 +2281,8 @@ msgstr ""
 "Цей інструмент допоможе Вам вибрати, які пакунки Ви хочете вилучити з свого\n"
 "комп'ютера."
 
-#: ../rpmdrake:2153
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1961,11 +2294,13 @@ msgstr ""
 "Ця програма допоможе вибрати поновлення, які Ви хочете встановити на \n"
 "свій комп'ютер."
 
-#: ../rpmdrake:2158
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Ласкаво просимо до інструменту встановлення програм!"
 
-#: ../rpmdrake:2159
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1979,171 +2314,213 @@ msgstr ""
 "дисках. Ця програма допоможе вибрати, які пакунки Ви \n"
 "хочете встановити на свій комп'ютер."
 
-#: ../rpmdrake.pm:103
-msgid "Mandriva Linux Update"
-msgstr "Поновлення Мандріва Лінакс"
-
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Поновлення програмам"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Поновлення Мандріва Лінакс"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Будь ласка, введіть дані для доступу до проксі\n"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Ім'я користувача:"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Вилучення пакунків з програмами"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Поновлення пакунків з програмами"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Встановлення пакунків з програмами"
 
-#: ../rpmdrake.pm:218
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Ні"
 
-#: ../rpmdrake.pm:222
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Так"
 
-#: ../rpmdrake.pm:272
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Інформація..."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Австрія"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Австралія"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Бельгія"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Бразилія"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Швейцарія"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Коста-Ріка"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Чехія"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Німеччина"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Данія"
 
-#: ../rpmdrake.pm:399 ../rpmdrake.pm:403
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Греція"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Іспанія"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Фінляндія"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Франція"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Угорщина"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Ізраїль"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Італія"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Японія"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Корея"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Голландія"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Норвегія"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Польща"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Португалія"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Росія"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Швеція"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Сінгапур"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Словаччина"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Об'єднане Королівство"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Китай"
 
-#: ../rpmdrake.pm:420 ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Сполучені Штати"
 
-#: ../rpmdrake.pm:520
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2155,7 +2532,8 @@ msgstr ""
 "\n"
 "Продовжити?"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2168,27 +2546,29 @@ msgstr ""
 "\n"
 "Продовжити?"
 
-#: ../rpmdrake.pm:530 ../rpmdrake.pm:568
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s вибирає"
 
-#: ../rpmdrake.pm:533
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Зачекайте, будь ласка, йде завантаження адрес дзеркал."
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Зачекайте, будь ласка, йде завантаження адрес дзеркал з веб-сайту Mandriva."
 
-#. - seems that value is bitten before being printed by next func..
-#: ../rpmdrake.pm:541
+#: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Помилка під час звантаження"
 
-#: ../rpmdrake.pm:543
-#, perl-format
+#: ../rpmdrake.pm:544
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2202,8 +2582,8 @@ msgstr ""
 "Можливо, мережа або веб-сайт недоступні.\n"
 "Будь ласка, спробуйте ще раз пізніше."
 
-#: ../rpmdrake.pm:548
-#, perl-format
+#: ../rpmdrake.pm:549
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2217,15 +2597,18 @@ msgstr ""
 "Можливо, мережа або веб-сайт Mandriva недоступні.\n"
 "Будь ласка, спробуйте ще раз пізніше."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Дзеркало відсутнє"
 
-#: ../rpmdrake.pm:560
+#: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Не можу знайти придатного джерела."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2239,64 +2622,69 @@ msgstr ""
 "стається через те, що архітектура Вашого процесора не підтримується\n"
 "Mandriva Linux Official Updates."
 
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Виберіть, будь ласка, бажане дзеркало."
 
-#: ../rpmdrake.pm:633
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Копіюється файл з джерела `%s'..."
 
-#: ../rpmdrake.pm:636
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Перевірка файла джерела `%s'..."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Перевірка файла джерела `%s'..."
 
-#: ../rpmdrake.pm:643
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " виконано."
 
-#: ../rpmdrake.pm:647
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " неуспішно!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:651
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s з джерела %s"
 
-#: ../rpmdrake.pm:655
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Починається завантаження `%s'..."
 
-#: ../rpmdrake.pm:659
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Завантажено `%s', залишилось часу:%s, швидкість:%s"
 
-#: ../rpmdrake.pm:662
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Завантажено `%s', швидкість:%s"
 
-#: ../rpmdrake.pm:673
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Зачекайте, будь ласка, поновлюються джерела..."
 
-#: ../rpmdrake.pm:700
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Помилка при пошуку пакунків"
 
-#: ../rpmdrake.pm:701
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2311,27 +2699,31 @@ msgstr ""
 "або ж він зараз недоступний і Вам потрібно спробувати ще раз\n"
 "пізніше."
 
-#: ../rpmdrake.pm:732
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Поновити джерела"
 
-#: ../rpmdrake.pm:737
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Не знайдено активного носія. Потрібно їх увімнути, щоб мати можливість "
 "поновлювати."
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Виберіть джерело, яке Ви хочете поновити:"
 
-#: ../rpmdrake.pm:762
+#: ../rpmdrake.pm:764
+#, c-format
 msgid "Update"
 msgstr "Поновити"
 
-#: ../rpmdrake.pm:783
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2343,8 +2735,8 @@ msgstr ""
 "Помилки:\n"
 "%s"
 
-#: ../rpmdrake.pm:806 ../rpmdrake.pm:817
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2354,16 +2746,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:829
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Неможливо створити джерело."
 
-#: ../rpmdrake.pm:834
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Помилка при додаванні носія"
 
-#: ../rpmdrake.pm:835
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2373,8 +2767,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:848
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2384,8 +2778,8 @@ msgstr ""
 "використовується (%s).\n"
 "Його буде вимкнено."
 
-#: ../rpmdrake.pm:851
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2395,11 +2789,13 @@ msgstr ""
 "Лінакс (%s).\n"
 "Його буде вимкнено."
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Довідку запущено у фоновому режимі"
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "Вікно довідки вже стартувало, незабаром воно з'явиться на стільниці."
@@ -2683,9 +3079,6 @@ msgstr "Менеджер джерел програм"
 #~ msgid "No package found for installation."
 #~ msgstr "Не знайдено пакунку для встановлення."
 
-#~ msgid "Stop"
-#~ msgstr "Зупинити"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "Всі пакунки, за джерелом"
 
diff --git a/po/vi.po b/po/vi.po
index 506cee1b..828ea301 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,19 +6,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-04 09:56+0100\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Hãy chọn loại phương tiện"
 
 #: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -38,15 +41,17 @@ msgstr ""
 "phân phối của bạn. Bạn có thể thêm cả hai qua hai bước."
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Các nguồn của phân phối"
 
 #: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Cập nhật chính thức"
 
 #: ../edit-urpm-sources.pl:97
-#, perl-format
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -63,87 +68,104 @@ msgstr ""
 "\n"
 "Tiếp tục được chưa?"
 
-#. because updates media do not provide media.cfg yet
 #: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Hãy chờ, đang thêm phương tiện..."
 
 #: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Thêm phương tiện"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Tập tin cục bộ"
 
 #: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Đường dẫn:"
 
 #: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Máy chủ FTP"
 
 #: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:416
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
 #: ../edit-urpm-sources.pl:148
-#, fuzzy
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "Máy chủ FTP"
 
 #: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Máy chủ HTTP"
 
 #: ../edit-urpm-sources.pl:150
-msgid "Path or mount point:"
-msgstr "Đường dẫn hoặc điểm gắn kết:"
-
-#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Thiết bị tháo lắp"
 
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Đường dẫn hoặc điểm gắn kết:"
+
 #: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Duyệt..."
 
-#: ../edit-urpm-sources.pl:197
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Đăng nhập:"
 
-#: ../edit-urpm-sources.pl:197 ../edit-urpm-sources.pl:501 ../rpmdrake.pm:131
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../edit-urpm-sources.pl:202 ../edit-urpm-sources.pl:417
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Đường dẫn liên quan tới synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:209
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Tên:"
 
-#: ../edit-urpm-sources.pl:217
+#: ../edit-urpm-sources.pl:216
+#, 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:228
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 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:238
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Bạn cần điền ít nhất là hai mục nhập đầu tiên."
 
-#: ../edit-urpm-sources.pl:242
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -151,113 +173,132 @@ 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:253
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Thêm phương tiện:"
 
-#: ../edit-urpm-sources.pl:255
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Loại phương tiện:"
 
-#: ../edit-urpm-sources.pl:263 ../edit-urpm-sources.pl:338
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:453
-#: ../edit-urpm-sources.pl:518 ../edit-urpm-sources.pl:600
-#: ../edit-urpm-sources.pl:640 ../edit-urpm-sources.pl:698
-#: ../edit-urpm-sources.pl:837 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:1921 ../rpmdrake:1929 ../rpmdrake.pm:287 ../rpmdrake.pm:596
-#: ../rpmdrake.pm:681 ../rpmdrake.pm:754
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: ../edit-urpm-sources.pl:265 ../edit-urpm-sources.pl:340
-#: ../edit-urpm-sources.pl:453 ../edit-urpm-sources.pl:508
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:639
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:763
-#: ../edit-urpm-sources.pl:830 ../edit-urpm-sources.pl:883
-#: ../edit-urpm-sources.pl:1032 ../rpmdrake:208 ../rpmdrake:960
-#: ../rpmdrake:977 ../rpmdrake:982 ../rpmdrake:1827 ../rpmdrake:1921
-#: ../rpmdrake:2068 ../rpmdrake.pm:122 ../rpmdrake.pm:227 ../rpmdrake.pm:289
-#: ../rpmdrake.pm:596
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:321
+#, 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:324
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "luôn luôn"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "không bao giờ"
 
-#: ../edit-urpm-sources.pl:334
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Kiểm tra RPMs được cài đặt:"
 
-#: ../edit-urpm-sources.pl:335
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Tải xuống chương trình để dùng:"
 
-#: ../edit-urpm-sources.pl:365
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Gỡ Bỏ Nguồn Phần Mềm"
 
-#: ../edit-urpm-sources.pl:366
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-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:371
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Hãy đợi, đang gỡ bỏ phương tiện..."
 
-#: ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Biên tập phương tiện"
 
-#: ../edit-urpm-sources.pl:413
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Biên tập phương tiện \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
 msgid "Downloader:"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:430
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Lưu lại các thay đổi"
 
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:1019
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:449
+#, 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:452
+#: ../edit-urpm-sources.pl:450
+#, 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:473
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Cấu hình các proxy"
 
-#: ../edit-urpm-sources.pl:484
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Thiết lập proxy cho phương tiện \"%s\""
 
-#: ../edit-urpm-sources.pl:485
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Thiết lập proxy chung"
 
-#: ../edit-urpm-sources.pl:487
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -265,142 +306,172 @@ msgstr ""
 "Nếu cần một proxy, hãy nhập hostname và một cổng (port) tùy ý (cú pháp: "
 "<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl:490
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy hostname:"
 
-#: ../edit-urpm-sources.pl:493
+#: ../edit-urpm-sources.pl:491
+#, 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:496
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Người dùng:"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Thêm nhóm song song"
 
-#: ../edit-urpm-sources.pl:568
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Biên tập nhóm song song"
 
-#: ../edit-urpm-sources.pl:579
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Thêm giới hạn phương tiện"
 
-#: ../edit-urpm-sources.pl:591
+#: ../edit-urpm-sources.pl:589
+#, 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:628
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Thêm host"
 
-#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:632
+#, 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:665
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Biên tập nhóm song song \"%s\":"
 
-#: ../edit-urpm-sources.pl:669
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Tên nhóm:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Giao thức:"
 
-#: ../edit-urpm-sources.pl:672
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Giới hạn phương tiện:"
 
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:684
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Thêm"
 
-#: ../edit-urpm-sources.pl:678 ../edit-urpm-sources.pl:685
-#: ../edit-urpm-sources.pl:743 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Gỡ Bỏ"
 
-#: ../edit-urpm-sources.pl:679
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Hosts:"
 
-#: ../edit-urpm-sources.pl:713
+#: ../edit-urpm-sources.pl:711
+#, 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:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Nhóm"
 
-#: ../edit-urpm-sources.pl:716
-msgid "Media limit"
-msgstr "Giới hạn phương tiện"
-
-#: ../edit-urpm-sources.pl:716
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Giao thức"
 
-#: ../edit-urpm-sources.pl:717
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Giới hạn phương tiện"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Lệnh"
 
-#: ../edit-urpm-sources.pl:727 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:886 ../rpmdrake:1748
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(không có)"
 
-#: ../edit-urpm-sources.pl:747 ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Hiệu chỉnh"
 
-#: ../edit-urpm-sources.pl:755 ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Thêm..."
 
-#: ../edit-urpm-sources.pl:771
+#: ../edit-urpm-sources.pl:769
+#, 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:775 ../edit-urpm-sources.pl:932
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Phương tiện"
 
 #: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Khóa"
 
-#: ../edit-urpm-sources.pl:799
+#: ../edit-urpm-sources.pl:803
+#, 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:812
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Thêm phím"
 
-#: ../edit-urpm-sources.pl:824
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-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:833
+#: ../edit-urpm-sources.pl:834
+#, c-format
 msgid "Close"
 msgstr "Đóng"
 
-#: ../edit-urpm-sources.pl:855
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Bỏ phím"
 
-#: ../edit-urpm-sources.pl:853
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -408,33 +479,38 @@ msgstr ""
 "Bạn có chắc là muốn gỡ bỏ khóa %s khỏi phương tiện %s không?\n"
 "(tên khoá là: %s)"
 
-#: ../edit-urpm-sources.pl:871
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Thêm phím..."
 
-#: ../edit-urpm-sources.pl:875
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Bỏ phím"
 
-#: ../edit-urpm-sources.pl:891
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Cấu hình phương tiện"
 
-#: ../edit-urpm-sources.pl:930
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Bật chạy?"
 
-#: ../edit-urpm-sources.pl:931
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Cập nhật"
 
-#: ../edit-urpm-sources.pl:947
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:977
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:981
+#, fuzzy, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -444,32 +520,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1011
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Thêm tuỳ chọn..."
 
-#: ../edit-urpm-sources.pl:1015
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Cập nhật..."
 
-#: ../edit-urpm-sources.pl:1018
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Quản lý phím..."
 
-#: ../edit-urpm-sources.pl:1020
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Song song..."
 
-#: ../edit-urpm-sources.pl:1021
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Tuỳ chọn chung..."
 
-#: ../edit-urpm-sources.pl:1031 ../rpmdrake:1428
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: ../edit-urpm-sources.pl:1047 ../gurpmi.addmedia:98 ../rpmdrake:2144
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -479,7 +561,8 @@ msgstr ""
 "\n"
 "Có đồng ý tiếp tục không?"
 
-#: ../edit-urpm-sources.pl:1050
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -493,7 +576,8 @@ 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:1063
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -506,11 +590,12 @@ msgstr ""
 "cài đặt các gói phần mềm?)."
 
 #: ../gurpmi.addmedia:88
+#, c-format
 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:102
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -521,7 +606,7 @@ msgstr ""
 "từ phương tiện mới này. "
 
 #: ../gurpmi.addmedia:105
-#, perl-format
+#, c-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"
@@ -532,21 +617,22 @@ msgstr ""
 "từ phương tiện mới này. "
 
 #: ../gurpmi.addmedia:130
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid "Successfully added media %s."
 msgstr "Thêm phương tiện `%s' thành công."
 
 #: ../gurpmi.addmedia:131
-#, perl-format
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Thêm phương tiện `%s' thành công."
 
 #: ../rpmdrake:39
-#, perl-format
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Cách dùng: %s [TÙY CHỌN]..."
 
 #: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -554,10 +640,12 @@ msgstr ""
 "  --changelog-first      hiển thị changelog trước filelist trong cửa sổ mô tả"
 
 #: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     giới hạn cho phương tiện"
 
 #: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
@@ -565,26 +653,31 @@ msgstr ""
 "tìm thấy"
 
 #: ../rpmdrake:43
+#, c-format
 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:44
+#, c-format
 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:45
+#, c-format
 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:46
+#, c-format
 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:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -593,26 +686,32 @@ msgstr ""
 "\"host\" để  hiển thị các phụ thuộc (deps)"
 
 #: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    chỉ hiển thị các gói này"
 
 #: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      chọn trước các gói này"
 
 #: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 ép chạy bằng root"
 
 #: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           chạy tìm kiếm cho \"pkg\""
 
 #: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Chạy trong chế độ người dùng"
 
 #: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -623,70 +722,86 @@ msgstr ""
 "có thể duyệt cơ sở dữ liệu hiện có."
 
 #: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Hỗ trợ"
 
 #: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
 #: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Lưu trữ"
 
 #: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Sao lưu"
 
 #: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Ghi CD"
 
 #: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Nén"
 
 #: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
 #: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
 #: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Khác"
 
 #: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
 #: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Sách"
 
 #: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Sách vi tính"
 
 #: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Câu hỏi hay gặp"
 
 #: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
 #: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Văn học"
 
 #: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "Cluster"
 
 #: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Kết thúc thông điệp"
 
 #: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Xắp hàng dịch vụ"
 
 #: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Viễn thông"
 
 #: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Cơ sở dữ liệu"
 
@@ -694,245 +809,302 @@ msgstr "Cơ sở dữ liệu"
 #: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
 #: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Phát triển"
 
 #: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
 #: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
 #: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME và GTK+"
 
 #: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
 #: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE và Qt"
 
 #: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
 #: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
 #: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
 #: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
 #: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Trình biên soạn"
 
 #: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Giáo dục"
 
 #: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Trình mô phỏng"
 
 #: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Công cụ tập tin"
 
 #: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
 #: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
 #: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Trò chơi"
 
 #: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Thám hiểm"
 
 #: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Arcade"
 
 #: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Bảng"
 
 #: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Bài lá"
 
 #: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Đố ô chữ"
 
 #: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Thể thao"
 
 #: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Chiến thuật"
 
 #: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
 #: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
 #: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Màn hình nền đồ họa"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
 #: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "Dựa trên FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
 #: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Đồ họa"
 
 #: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Theo dõi"
 
 #: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Đa phương tiện"
 
 #: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Video"
 
 #: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
 #: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
 #: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Chạy mạng"
 
 #: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Tán chuyện"
 
 #: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Truyền tập tin"
 
 #: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
 #: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Thông điệp tức thời"
 
 #: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Thư"
 
 #: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Tin tức"
 
 #: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Truy cập từ xa"
 
 #: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
 #: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Văn phòng"
 
 #: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Khóa công cộng"
 
 #: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Xuất bản"
 
 #: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
 #: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
 #: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Khoa học"
 
 #: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Thiên văn học"
 
 #: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Sinh học"
 
 #: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Hóa học"
 
 #: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Khoa học máy tính"
 
 #: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Geosciences"
 
 #: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Toán học"
 
 #: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Vật lý"
 
 #: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shells"
 
 #: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Âm thanh"
 
@@ -942,326 +1114,391 @@ msgstr "Âm thanh"
 #: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
 #: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
 #: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Hệ thống"
 
 #: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Cơ sở"
 
 #: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
 #: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Cấu hình"
 
 #: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Khởi động và Khởi tạo"
 
 #: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Phần cứng"
 
 #: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Đóng gói"
 
 #: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "In ấn"
 
 #: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Triển khai"
 
 #: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Triển khai"
 
 #: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
 #: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Phông chữ"
 
 #: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Console"
 
 #: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
 #: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
 #: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
 #: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Quốc tế hóa"
 
 #: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel và phần cứng"
 
 #: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Thư viện"
 
 #: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Máy chủ"
 
 #. -PO: This is a package/product name. Only translate it if needed:
 #: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
 #: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminals"
 
 #: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Công cụ văn bản"
 
 #: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Đồ chơi"
 
-#. for Mandriva Choice:
 #: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
 #: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
 #: ../rpmdrake:345 ../rpmdrake:346
-#, fuzzy
+#, c-format
 msgid "Workstation"
-msgstr "Cấu hình LAN"
+msgstr "Máy trạm"
 
 #: ../rpmdrake:339
-#, fuzzy
+#, c-format
 msgid "Console Tools"
-msgstr "Console"
+msgstr "Các công cụ console"
 
 #: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
 msgid "Documentation"
-msgstr ""
+msgstr "Tài liệu"
 
 #: ../rpmdrake:341
+#, c-format
 msgid "Game station"
-msgstr ""
+msgstr "Trò chơi"
 
 #: ../rpmdrake:342
-#, fuzzy
+#, c-format
 msgid "Internet station"
-msgstr "Quốc tế hóa"
+msgstr "Internet"
 
 #: ../rpmdrake:343
-#, fuzzy
+#, c-format
 msgid "Multimedia station"
 msgstr "Đa phương tiện"
 
 #: ../rpmdrake:344
-#, fuzzy
+#, c-format
 msgid "Network Computer (client)"
-msgstr "Khoa học máy tính"
+msgstr "Máy tính mạng (khách)"
 
 #: ../rpmdrake:345
+#, c-format
 msgid "Office Workstation"
-msgstr ""
+msgstr "Văn phòng"
 
 #: ../rpmdrake:346
+#, c-format
 msgid "Scientific Workstation"
 msgstr ""
 
 #: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Graphical Environment"
-msgstr "Màn hình nền đồ họa"
+msgstr "Môi trường đồ hoạ"
 
 #: ../rpmdrake:349
+#, c-format
 msgid "GNOME Workstation"
-msgstr ""
+msgstr "GNOME Workstation"
 
 #: ../rpmdrake:350
+#, c-format
 msgid "IceWm Desktop"
-msgstr ""
+msgstr "IceWm Desktop"
 
 #: ../rpmdrake:351
+#, c-format
 msgid "KDE Workstation"
-msgstr ""
+msgstr "KDE"
 
 #: ../rpmdrake:352
-#, fuzzy
+#, c-format
 msgid "Other Graphical Desktops"
-msgstr "Màn hình nền đồ họa"
+msgstr "Các màn hình nền đồ hoạ khác"
 
 #: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
 #: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
 msgid "Server"
 msgstr "Máy chủ"
 
 #: ../rpmdrake:357
+#, c-format
 msgid "DNS/NIS"
-msgstr ""
+msgstr "DNS/NIS"
 
 #: ../rpmdrake:358
-#, fuzzy
+#, c-format
 msgid "Database"
 msgstr "Cơ sở dữ liệu"
 
 #: ../rpmdrake:359
+#, c-format
 msgid "Firewall/Router"
-msgstr ""
+msgstr "Tường lửa/Định tuyến"
 
 #: ../rpmdrake:361
+#, c-format
 msgid "Mail/Groupware/News"
 msgstr ""
 
 #: ../rpmdrake:362
-#, fuzzy
+#, c-format
 msgid "Network Computer server"
-msgstr "Khoa học máy tính"
+msgstr "Máy chủ mạng"
 
 #: ../rpmdrake:363
+#, c-format
 msgid "Web/FTP"
-msgstr ""
+msgstr "Web/FTP"
 
-#. - to highlight information
-#: ../rpmdrake:502 ../rpmdrake:707 ../rpmdrake:712 ../rpmdrake:726
-#: ../rpmdrake:728
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Không có sẵn)"
 
-#: ../rpmdrake:534
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Kết quả tìm kiếm"
 
 #: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Kết quả tìm kiếm (không)"
 
-#: ../rpmdrake:545 ../rpmdrake:2125
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Hãy đợi, đang tìm kiếm..."
 
-#: ../rpmdrake:617 ../rpmdrake:921
-msgid "Addable"
-msgstr "Có thể thêm vào"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Trình Quản Lý Nguồn Phần Mềm"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Dừng"
 
-#: ../rpmdrake:617 ../rpmdrake:921
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Có thể nâng cấp"
 
-#: ../rpmdrake:619
-msgid "Not selected"
-msgstr "Không được chọn"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Có thể thêm vào"
 
 #: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Được chọn"
 
-#. is it an update?
-#: ../rpmdrake:687 ../rpmdrake:744
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Không được chọn"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Mức độ quan trọng: "
 
-#: ../rpmdrake:688 ../rpmdrake:752
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Lý do cập nhật:"
 
-#: ../rpmdrake:692
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Cập nhật bảo mật"
 
-#: ../rpmdrake:700 ../rpmdrake:754
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Không có mô tả"
 
-#: ../rpmdrake:703
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Tập tin:"
 
-#: ../rpmdrake:711
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Bản ghi thay đổi (Changelog):"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Tập tin:\n"
 
-#: ../rpmdrake:728
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Bản ghi thay đổi (Changelog):\n"
 
-#: ../rpmdrake:733 ../rpmdrake.pm:807
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Phương tiện: "
 
-#: ../rpmdrake:734
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Phiên bản đã cài đặt hiện thời: "
 
-#: ../rpmdrake:738
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Tên: "
 
-#: ../rpmdrake:739
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Phiên bản: "
 
-#: ../rpmdrake:740
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:741
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:741
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Kích thước: "
 
-#. extra empty line
-#: ../rpmdrake:748
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Tóm tắt: "
 
-#: ../rpmdrake:754
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Mô tả: "
 
-#: ../rpmdrake:810 ../rpmdrake.pm:179
-#, fuzzy
-msgid "Software Management"
-msgstr "Trình Quản Lý Nguồn Phần Mềm"
-
-#: ../rpmdrake:827 ../rpmdrake:973 ../rpmdrake:975
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Thêm các thông tin về gói..."
 
-#: ../rpmdrake:829
-msgid "One of the following packages is needed:"
-msgstr "Cần đến một trong các gói tin sau:"
-
-#: ../rpmdrake:829
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Hãy chọn"
 
-#: ../rpmdrake:870
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Cần đến một trong các gói tin sau:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Hãy đợi, đang liệt kê các gói..."
 
-#: ../rpmdrake:888
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Không có cập nhật"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1271,35 +1508,42 @@ 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:912 ../rpmdrake:1174
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 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:960 ../rpmdrake:965
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Thêm thông tin"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Thông tin về các gói"
 
-#: ../rpmdrake:991
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Cần gỡ bỏ một số gói bổ sung"
 
-#: ../rpmdrake:992
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Do các phụ thuộc của chúng, mà những gói sau đây cũng cần được gỡ bỏ:"
 
-#: ../rpmdrake:998 ../rpmdrake:1007
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Không thể gỡ bỏ một số gói tin"
 
-#: ../rpmdrake:999
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1307,7 +1551,8 @@ 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:1008 ../rpmdrake:1073
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1317,11 +1562,13 @@ msgstr ""
 "ngay bây giờ:\n"
 "\n"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Cần thêm các gói bổ sung"
 
-#: ../rpmdrake:1038
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1331,137 +1578,159 @@ msgstr ""
 "cài đặt:\n"
 "\n"
 
-#: ../rpmdrake:1053
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (theo danh sách bỏ qua)"
 
-#: ../rpmdrake:1056
-msgid "Some packages can't be installed"
-msgstr "Không thể cài đặt một số gói tin"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Không thể cài đặt một số gói tin"
 
-#: ../rpmdrake:1057
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "Xin lỗi, không thể chọn các gói sau:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:1072 ../rpmdrake:1896
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Một số gói cần được gỡ bỏ"
 
-#: ../rpmdrake:1101
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Đã chọn: %s / Không gian đĩa trống: %s"
 
-#: ../rpmdrake:1102
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Kích thước được chọn: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:1107
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "Không có mô tả cho gói tin này\n"
 
-#: ../rpmdrake:1113 ../rpmdrake:1506
-#, perl-format
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Xả ra lỗi trầm trọng: %s."
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Cài đặt"
 
-#: ../rpmdrake:1174
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Cài đặt"
 
-#: ../rpmdrake:1175
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s lựa chọn"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Các lựa chọn của Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1177
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Mọi gói tin, theo bảng chữ cái"
 
-#: ../rpmdrake:1178
+#: ../rpmdrake:1175
+#, 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:1179
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Mọi gói tin, theo kích thước"
 
-#: ../rpmdrake:1180
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Mọi gói tin, theo tình trạng chọn"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Chỉ bỏ đó, xếp loại theo ngày cài đặt"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Mọi gói tin, theo nhóm"
 
-#: ../rpmdrake:1184
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Cập nhật thông thường"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Cập nhật bảo mật"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Cập nhật sửa lỗi"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Cập nhật thông thường"
 
-#: ../rpmdrake:1184
-msgid "Security updates"
-msgstr "Cập nhật bảo mật"
-
-#: ../rpmdrake:1247
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "trong các tên"
 
-#: ../rpmdrake:1249
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "trong các mô tả"
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "theo tên tập tin"
 
-#: ../rpmdrake:1278
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Lỗi: %s được mount là read-only."
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1279
+#, 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:1287
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Có quá nhiều gói tin được chọn"
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1285
+#, 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"
@@ -1477,143 +1746,171 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn cài đặt tất cả các gói đã chọn không?"
 
-#: ../rpmdrake:1320 ../rpmdrake:1323 ../rpmdrake:1334 ../rpmdrake:1347
-#: ../rpmdrake:1356
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Tệp"
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Cập nhật phương tiện"
 
-#: ../rpmdrake:1334
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Đặt lại việc chọn"
 
-#: ../rpmdrake:1347
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Nạp lại danh sách các _gói"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/Th_oát"
 
-#: ../rpmdrake:1356
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1359 ../rpmdrake:1360 ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/Tù_y chọn"
 
-#: ../rpmdrake:1360
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Trình Quản Lý Nguồn Phần Mềm"
 
-#: ../rpmdrake:1363 ../rpmdrake:1393
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Tự động _hiển thị các gói đã được chọn"
 
-#: ../rpmdrake:1367 ../rpmdrake:1368 ../rpmdrake:1369 ../rpmdrake:1370
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/Trợ _Giúp"
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Báo cáo lỗi"
 
-#: ../rpmdrake:1370
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/Giới thiệ_u..."
 
-#. nicer formatting
-#: ../rpmdrake:1373
-#, fuzzy
+#: ../rpmdrake:1370
+#, fuzzy, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1375
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1377
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1379
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1384
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../rpmdrake:1408
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Tìm:"
 
-#: ../rpmdrake:1417
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../rpmdrake:1419
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Xóa sạch"
 
-#: ../rpmdrake:1433 ../rpmdrake.pm:758
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
 msgid "Select all"
 msgstr "Chọn toàn bộ"
 
-#: ../rpmdrake:1440
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "áp dụng"
 
-#: ../rpmdrake:1444
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../rpmdrake:1460
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1461
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1462
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1463
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
 #: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Lỗi trầm trọng"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
-msgid "Initializing..."
-msgstr "Đang khởi tạo..."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Hãy đợi"
 
-#: ../rpmdrake:1507 ../rpmdrake:1932
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
 msgid "Package installation..."
 msgstr "Cài đặt gói tin..."
 
-#: ../rpmdrake:1507 ../rpmdrake:1932 ../rpmdrake.pm:311
-msgid "Please wait"
-msgstr "Hãy đợi"
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Đang khởi tạo..."
 
-#: ../rpmdrake:1530 ../rpmdrake:1918
-#, fuzzy
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "Cấu hình LAN"
+msgstr "Cấu hình"
 
-#: ../rpmdrake:1532
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1625,12 +1922,13 @@ msgstr ""
 "\n"
 "Tiếp tục được chưa?"
 
-#: ../rpmdrake:1541
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Các phương tiện cập nhật hiện đang có"
 
-#: ../rpmdrake:1542
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1646,12 +1944,13 @@ msgstr ""
 "\n"
 "Sau đó chạy lại %s."
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Cách chọn thủ công mirror của bạn"
 
-#: ../rpmdrake:1554
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1665,67 +1964,73 @@ msgstr ""
 "\n"
 "Sau đó chạy lại %s."
 
-#: ../rpmdrake:1567
-#, fuzzy
+#: ../rpmdrake:1570
+#, fuzzy, c-format
 msgid "Reading updates description"
 msgstr "trong các mô tả"
 
-#: ../rpmdrake:1593 ../rpmdrake:1670
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Hãy đợi, đang tìm các gói sẵn có..."
 
-#: ../rpmdrake:1601
-#, fuzzy
+#: ../rpmdrake:1604
+#, fuzzy, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Hãy đợi, đang liệt kê các gói..."
 
-#: ../rpmdrake:1637
-#, fuzzy
+#: ../rpmdrake:1640
+#, fuzzy, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Hãy đợi, đang tìm các gói sẵn có..."
 
-#: ../rpmdrake:1771
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Thẩm tra %s"
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "các thay đổi:"
 
-#: ../rpmdrake:1780
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Gỡ Bỏ .%s"
 
-#: ../rpmdrake:1784
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Dùng .%s là tập tin chính"
 
-#: ../rpmdrake:1788
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Không làm gì"
 
-#: ../rpmdrake:1804
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Kết thúc cài đặt"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Thẩm tra..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1852 ../rpmdrake:2045
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Mọi gói tin yêu cầu đã được cài đặt thành công."
 
-#: ../rpmdrake:1856 ../rpmdrake:2025
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Trục trặc trong khi cài đặt"
 
-#: ../rpmdrake:1857 ../rpmdrake:2026 ../rpmdrake:2084
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1735,17 +2040,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1876
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Không thể lấy các gói nguồn."
 
-#: ../rpmdrake:1877
-#, perl-format
+#: ../rpmdrake:1902
+#, c-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:1878 ../rpmdrake:1976
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1757,60 +2063,73 @@ msgstr ""
 "Báo cáo lỗi:\n"
 "%s"
 
-#: ../rpmdrake:1894
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "Để thỏa mãn các phụ thuộc, %d gói sau đây sẽ được cài đặt:\n"
 "%s\n"
 
-#: ../rpmdrake:1898
-#, fuzzy, perl-format
-msgid "Remove %d packages?"
-msgstr "Bỏ phím"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Bỏ phím"
 
-#: ../rpmdrake:1899
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Các gói sau phải được gỡ bỏ để nâng cấp các gói khác:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"Đã được để tiếp tục chưa?"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
 msgstr ""
-"Các gói sau phải được gỡ bỏ để nâng cấp các gói khác:\n"
-"\n"
 "%s\n"
 "\n"
-"Đã được để tiếp tục chưa?"
+"Có đồng ý tiếp tục không?"
 
-#: ../rpmdrake:1941
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Thay phương tiện"
 
-#: ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Hãy nạp phương tiện có tên \"%s\" lên thiết bị [%s]"
 
-#: ../rpmdrake:1927
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Đang tải xuống gói tin `%s' (%s/%s)..."
 
-#: ../rpmdrake:1947
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Đang thẩm tra chữ ký của các gói tin..."
 
-#: ../rpmdrake:1960 ../rpmdrake.pm:737 ../rpmdrake.pm:846
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../rpmdrake:1961
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1824,12 +2143,13 @@ msgstr ""
 "\n"
 "Bạn vẫn muốn tiếp tục cài đặt không?"
 
-#: ../rpmdrake:1973 ../rpmdrake:2083
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Cài đặt không được"
 
-#: ../rpmdrake:1974
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1841,26 +2161,28 @@ msgstr ""
 "\n"
 "Có thể bạn cần cập nhật cơ sở dữ liệu phương tiện."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Đang chuẩn bị cài đặt các gói tin..."
 
-#: ../rpmdrake:1988
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Đang chuẩn bị..."
 
-#: ../rpmdrake:1991
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Đang cài đặt gói tin `%s' (%s/%s)..."
 
-#: ../rpmdrake:2006
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "không thể truy cập tập tin rpm [%s]"
 
-#: ../rpmdrake:2040
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1872,43 +2194,48 @@ 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:2048
-#, fuzzy
+#: ../rpmdrake:2073
+#, fuzzy, c-format
 msgid "Upgrade information"
 msgstr "Thông tin thông thường"
 
-#: ../rpmdrake:2050
+#: ../rpmdrake:2075
+#, c-format
 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:2058
-#, fuzzy
+#: ../rpmdrake:2083
+#, fuzzy, c-format
 msgid "Upgrade information about this package"
 msgstr "Thêm các thông tin về gói..."
 
-#: ../rpmdrake:2061
-#, fuzzy, perl-format
+#: ../rpmdrake:2086
+#, fuzzy, c-format
 msgid "Upgrade information about package %s"
 msgstr "Thêm các thông tin về gói... [%s]"
 
-#: ../rpmdrake:2073 ../rpmdrake.pm:724 ../rpmdrake.pm:805 ../rpmdrake.pm:829
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Lỗi"
 
-#: ../rpmdrake:2074
+#: ../rpmdrake:2099
+#, c-format
 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:2099
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Hãy đợi, đang gỡ bỏ các gói..."
 
-#: ../rpmdrake:2110
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Có trục trặc khi gỡ bỏ"
 
-#: ../rpmdrake:2111
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1918,11 +2245,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2143
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Chào Mừng"
 
-#: ../rpmdrake:2148
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1934,8 +2263,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:2153
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1947,11 +2276,13 @@ 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:2158
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Chào mừng công cụ cài đặt phần mềm!"
 
-#: ../rpmdrake:2159
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1965,171 +2296,213 @@ 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:103
-msgid "Mandriva Linux Update"
-msgstr "Cập Nhật Mandriva Linux"
-
-#: ../rpmdrake.pm:103
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Cập nhật phần mềm"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Cập Nhật Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, c-format
 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:131
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Tên người dùng:"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Gỡ Bỏ Các Gói Phần Mềm"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Cập Nhật Các Gói Phần Mềm"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Cài đặt các gói phần mềm"
 
-#: ../rpmdrake.pm:218
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Không"
 
-#: ../rpmdrake.pm:222
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Có"
 
-#: ../rpmdrake.pm:272
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Thông tin..."
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Áo"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Châu úc"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Bỉ"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Czech Republic"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Germany"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:399 ../rpmdrake.pm:403
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Hy lạp"
 
-#: ../rpmdrake.pm:400
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Tây ban nha"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Phần Lan"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Pháp"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Hungary"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Ý"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Nhật"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Nam Triều Tiên"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Na Uy"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Ba Lan"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Nga"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Thụy Điển"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Đài Loan"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Liên Hiệp Anh"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Trung Quốc"
 
-#: ../rpmdrake.pm:420 ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Hoa Kỳ"
 
-#: ../rpmdrake.pm:520
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2141,7 +2514,8 @@ msgstr ""
 "\n"
 "Nó có tốt để tiếp tục không?"
 
-#: ../rpmdrake.pm:524
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2153,26 +2527,28 @@ msgstr ""
 "\n"
 "Nó có tốt để tiếp tục không?"
 
-#: ../rpmdrake.pm:530 ../rpmdrake.pm:568
-#, fuzzy
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, fuzzy, c-format
 msgid "Mirror choice"
 msgstr "%s lựa chọn"
 
-#: ../rpmdrake.pm:533
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Hãy đợi, đang tải xuống các địa chỉ mirror."
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:535
+#, c-format
 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."
 
-#. - seems that value is bitten before being printed by next func..
-#: ../rpmdrake.pm:541
+#: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Lỗi khi đang tải xuống"
 
-#: ../rpmdrake.pm:543
-#, perl-format
+#: ../rpmdrake.pm:544
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2186,8 +2562,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:548
-#, perl-format
+#: ../rpmdrake.pm:549
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2201,15 +2577,18 @@ 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:558
+#: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Không có mirror"
 
-#: ../rpmdrake.pm:560
+#: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Không thể tìm thấy mirror thích hợp."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2223,64 +2602,69 @@ 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:580
+#: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Hãy chọn mirror mong muốn."
 
-#: ../rpmdrake.pm:633
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Đang sao chép tập tin cho phương tiện `%s'..."
 
-#: ../rpmdrake.pm:636
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Đang kiểm tra tập tin của phương tiện `%s'..."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-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:643
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " hoàn thành."
 
-#: ../rpmdrake.pm:647
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " không được!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:651
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s từ phương tiện %s"
 
-#: ../rpmdrake.pm:655
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Đang bắt đầu tải về `%s'..."
 
-#: ../rpmdrake.pm:659
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-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:662
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Tải xuống của `%s', tốc độ:%s"
 
-#: ../rpmdrake.pm:673
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Hãy đợi, đang cập nhật phương tiện..."
 
-#: ../rpmdrake.pm:700
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Lỗi lấy về các gói tin"
 
-#: ../rpmdrake.pm:701
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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,25 +2679,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:732
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Phương tiện cập nhật"
 
-#: ../rpmdrake.pm:737
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:746
+#, c-format
 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:762
+#: ../rpmdrake.pm:764
+#, c-format
 msgid "Update"
 msgstr "Cập nhật"
 
-#: ../rpmdrake.pm:783
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2325,8 +2713,8 @@ msgstr ""
 "Lỗi:\n"
 "%s"
 
-#: ../rpmdrake.pm:806 ../rpmdrake.pm:817
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2336,16 +2724,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:829
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Không thể tạo phương tiện."
 
-#: ../rpmdrake.pm:834
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Lỗi khi thêm phương tiện"
 
-#: ../rpmdrake.pm:835
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2355,8 +2745,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:848
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2366,8 +2756,8 @@ msgstr ""
 "s).\n"
 "Nó sẽ không hoạt động."
 
-#: ../rpmdrake.pm:851
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2377,11 +2767,13 @@ msgstr ""
 "chạy (%s).\n"
 "Nó sẽ không được hoạt động."
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Đã chạy trợ giúp ở nền"
 
-#: ../rpmdrake.pm:869
+#: ../rpmdrake.pm:871
+#, c-format
 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."
@@ -2669,9 +3061,6 @@ msgstr "Trình Quản Lý Nguồn Phần Mềm"
 #~ msgid "No package found for installation."
 #~ msgstr "Không tìm thấy gói tin để cài đặt."
 
-#~ 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"
 
diff --git a/po/wa.po b/po/wa.po
index 86296545..455e2427 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\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,12 +21,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "Tchoezixhoz l' sôre di sopoirt"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -49,16 +52,18 @@ msgstr ""
 "distribucion. (Vos ploz eto radjouter les deus sôres, mins vos l' divoz fé e "
 "deus côps)."
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "Sourdants del distribucion"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "Metaedjes a djoû oficirs"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -77,86 +82,106 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "Tårdjîz on pô s' i vs plait, radjoutaedje do sopoirt..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Radjouter on sopoirt"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Fitchîs locås"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Tchimin:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "Sierveu FTP"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "Hårdêye:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "Sierveu RSYNC"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "Sierveu HTTP"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Tchimin ou pont di montaedje:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Bodjåve sopoirt"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Tchimin ou pont di montaedje:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Foyter..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "No d' elodjaedje:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Sicret:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Tchimin relatif pol fitchî di sinteze ou hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 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:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "No:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "Fé on sopoirt po ene distribucion etire"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "Cweri après des metaedjes a djoû e ç' sopoirt ci"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Vos dvoz rimpli pol moens les deus prumirès intrêyes."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -164,109 +189,132 @@ msgstr ""
 "I gn a ddja on sopoirt avou ç' no la,\n"
 "el voloz vs vormint replaecî?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Radjoutant on sopoirt:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Sôre di sopoirt:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "'l est bon"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "Tchuzes globåles po l' astalaedje des pacaedjes"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "tofer"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "måy"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifyî les RPM a-z astaler:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "Programe a-z eployî po les aberwetaedjes:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "Oistaedje d' on sourdant"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-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:361
+#: ../edit-urpm-sources.pl:370
+#, 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:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Candjî on sopoirt"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Dji candje li sopoirt «%s»:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Schaper les candjmints"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Procsi..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, 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:438
+#: ../edit-urpm-sources.pl:450
+#, 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:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Apontyî les procsis"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Apontiaedjes di procsi pol sopoirt «%s»"
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "Apontiaedjes di procsi globås"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -274,140 +322,174 @@ msgstr ""
 "Si vos avoz mezåjhe d' on procsi, dinez si no d' lodjoe et motoit ossu li "
 "pôrt a-z eployî (sintacse: <lodjoe_proxy[:pôrt]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "No d' lodjoe do procsi:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, 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:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Uzeu:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Radjouter on groupe paralele"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Candjî on groupe paralele"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Radjouter ene limite di sopoirt"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, 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:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Radjouter on lodjoe"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, 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:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Dji candje li groupe paralele «%s»:"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "No do groupe:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Protocole:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Limite do sopoirt:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Radjouter"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Oister"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Lodjoe:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, 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:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Groupe"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Limite do sopoirt"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Limite do sopoirt"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Comande"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(nole)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "Candjî..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Radjouter..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, 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:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Sopoirt"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Clés"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, 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:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Radjouter ene clé"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Tchoezixhoz ene clé a radjouter pol sopoirt %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Clôre"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Oister ene clé"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -415,32 +497,38 @@ msgstr ""
 "Estoz vs seur di voleur oister l' clé %s do sopoirt %s?\n"
 "(no del clé: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Radjouter ene clé..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Oister l' clé"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Apontyî les sopoirts"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "En alaedje?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "Metaedjes a djoû?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 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:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -450,32 +538,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "Radjouter da vosse..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Mete a djoû..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Manaedjî les clés..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Paralele..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "Tchuzes globåles..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Aidance"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -485,7 +579,8 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -499,7 +594,8 @@ 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:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -511,12 +607,13 @@ msgstr ""
 "d' astalaedje so èn ôte sicribanne, oudonbén estoz vs astalant des pacaedjes "
 "pol moumint?)."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 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:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -526,8 +623,8 @@ msgstr ""
 "Ça vout dire ki vos pôroz astaler des noveas pacaedjes di programas\n"
 "so vosse sistinme a pårti d' ci sopoirt ci."
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -537,22 +634,23 @@ 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:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "Li sopoirt «%s» a stî radjouté comifåt."
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Li sopoirt «%s» a stî radjouté comifåt."
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Po s' è siervi: %s [TCHUZES]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -560,39 +658,46 @@ msgstr ""
 "  --changelog-first      håyner l' djivêye des candjmints divant l' djivêye "
 "des fitchîs"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=sopoirt1,...   si limiter ås sopoirts dinés"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 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:42
+#: ../rpmdrake:43
+#, c-format
 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:43
+#: ../rpmdrake:44
+#, c-format
 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:44
+#: ../rpmdrake:45
+#, c-format
 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:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        èn nén verifyî les sinateures des pacaedjes"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -600,27 +705,33 @@ 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:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    mostrer seulmint ces pacaedjes la"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      pré-tchoezi ces pacaedjes la"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 foirci l' programe a s' enonder dzo root"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           enonder on cweraedje po «pkg»"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Enondé e môde uzeu"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -630,545 +741,785 @@ 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:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Accessibilité"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Årtchivaedje"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Copeyes di såvrité"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Broûlaedje di CDs"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Rastrindaedje"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Ôte"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Lives"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Lives d' informatike"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Belès letes"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "Passaedje di messaedjes"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "Siervices di cawêyes"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Comunicåcions"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Båzes di dnêyes"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "Programaedje"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME et Gtk+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE et Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Nawea"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Aspougneus di tecse"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Acsegnmint"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Emulateus"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Usteyes po fitchîs"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Djeus"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Advinteure"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Årcåde"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Djeus d' platea"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Cwårdjeus"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Puzeles"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Spôrts"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Sitratedjeye"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Sicribanne"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "Båzés so FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Dessinaedjes"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Corwaitaedje"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Videyo"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Rantoele"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Tchate"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Transfer di fitchîs"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr ""
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Emilaedje"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Copinreyes (newsgroups)"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Accès då lon"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "Waibe"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Buro"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "Clés publikes"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Eplaidaedje"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Siyinces"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Astronomeye"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Biyolodjeye"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Tchimeye"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Informatike"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Siyinces del Daegn"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Matematike"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Fizike"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Son"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "Sistinme"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Båze"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Apontiaedje"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Enondaedje del éndjole"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Éndjolreye"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Manaedjmint des pacaedjes"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Imprimaedje"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Disployaedje"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Disployaedje"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Fontes"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Conzôle"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "Bitmap X11"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Eternåcionålijhaedje"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Nawea eyet éndjolreye"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Livreyes"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Sierveus"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Terminås"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Usteyes tecse"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Djouwets"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Posse éndjolrece"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Usteyes pol conzôle"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Documintåcion"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Posse di djeus"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Posse pol rantoele daegnrece"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Posse multimedia"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Copiutrece rantoele (cliyint)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Posse di buro"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Evironmint grafike"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Posse éndjolrece GNOME"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "Sicribanne IceWm"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "Posse éndjolrece KDE"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Ôtes sicribannes grafikes"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Sierveu"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Sierveu, båzes di dnêyes"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Côpe feu/Routeu"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Copiutrece sierveu sol rantoele"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Sierveu, Waibe/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Nén disponibe)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Rizultats do cweraedje"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Rizultats do cweraedje (nouk)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Tårdjîz on pô s' i vs plait, dji cwir..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Pout esse radjouté"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Manaedjeu di programes"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Arester"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Pout esse metou a djoû"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Nén tchoezi"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Pout esse radjouté"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Tchoezi"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Nén tchoezi"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Impôrtance: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Råjhon do metaedje a djoû: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "Anonce di såvrité"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Nou discrijhaedje"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Fitchîs:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Djournå des candjmints:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Fitchîs:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Djournå des candjmints:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Sopoirt: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Modêye d' astalêye: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "No do pacaedje: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Modêye: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "Årtchitecteure: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s Ko"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Grandeu: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s Ko"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Rascourti: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Discrijhaedje: "
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "Manaedjeu di programes"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Pus d' informåcions sol pacaedje..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Tchoezixhoz s' i vs plait"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "I gn a mezåjhe do pacaedje ki shût:"
+msgstr[1] "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Tårdjîz on pô s' i vs plait, dji fwait l' djivêye des pacaedjes..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Nou metaedjes a djoû"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1178,34 +1529,41 @@ 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:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Totafwait"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Pus d' info"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Informåcion so les pacaedjes"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Kékès ôtes pacaedjes divèt esse oistés"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "Cåze di leus aloyances, les pacaedjes ki shuvèt dvèt esse oistés eto:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Des pacaedjes k' i gn a n' polèt nén esse oistés"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1213,7 +1571,8 @@ msgstr ""
 "Dji rgrete, mins oister ces pacaedjes la va spiyî l' sistinme da vosse:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1223,11 +1582,13 @@ msgstr ""
 "asteure:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Ôtes pacaedjes k' end a mezåjhe"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1236,129 +1597,164 @@ msgstr ""
 "Po verifyî les aloyances, les pacaedjes ki shuvèt dvèt esse astalés eto:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (fwait pårteye del djivêye a passer houte)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Des pacaedjes k' i gn a n' polèt nén esse astalés"
+#: ../rpmdrake:1053
+#, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "On pacaedje k' i gn a n' pout nén esse astalé"
+msgstr[1] "Des pacaedjes k' i gn a n' polèt nén esse astalés"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Dji rgrete, li pacaedje ki shût n' pout nén esse tchoezi:\n"
+"\n"
+"%s"
+msgstr[1] ""
 "Dji rgrete, les pacaedjes ki shuvèt n' polèt nén esse tchoezis:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Des pacaedjes k' i gn a dvèt esse dizastalés"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Tchoezi: %s / Plaece libe sol deure plake: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Grandeu tchoezeye: %d Mo"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "I n' a pont d' discrijhaedje po ç' pacaedje ci\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "I gn a-st avou èn aroke moirt: %s."
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "Astalé(s)"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "Nén astalé(s)"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s tchuzes"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Tchuzes di Mandriva Linux"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Tos les pacaedjes, relîs alfabeticmint"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "To les pacaedjes, pa disponibilité di metaedjes a djoû"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Tos les pacaedjes, pa grandeu"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Tos les pacaedjes, pa l' estat di tchoezixhaedje"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Rén k' les foyes, reléjhowes pal date d' astalaedje"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Tos les pacaedjes, pa groupe"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "Tos les metaedjes a djoû"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Metaedjes a djoû di såvrité"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Metaedjes a djoû di coridjaedje"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Metaedjes a djoû normås"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Metaedjes a djoû di såvrité"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "ezès nos d' pacaedje"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "ezès discrijhaedjes"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "ezès nos d' fitchîs"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "Aroke: i shonne ki %s soeye monté e môde seulmint-lére."
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Vos dvoz tchoezi sacwants pacaedjes d' aprume."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Pår trop di pacaedjes ont stî tchoezis"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1373,135 +1769,177 @@ msgstr ""
 "\n"
 "Voloz vs vormint astaler tos les pacaedjes tchoezis?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Fitchî"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Mete a djoû les sopoirts"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Rifé l' tchuze"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/Ritcherdjî li djivêye des _pacaedjes"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/Moussî _foû"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Tchuzes"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/_Manaedjeu des sopoirts d' astalaedje"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Mostrer les pacaedjes tchoezis _otomaticmint"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Aidance"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Rapoirter on bug"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/Å_d fwait..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
-msgstr "Åd fwait di Rpmdrake"
+#: ../rpmdrake:1370
+#, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s pa Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 "Rpmdrake c' est l' usteye di manaedjaedje des pacaedjes di Mandriva Linux"
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Pablo Saratxaga <pablo@mandriva.com>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Trover:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Cweri"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Netyî"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Tchoezi ttafwait"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Mete en ouve"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Cwiter"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "Adrovaedje abeye"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 "Vos ploz foyer emey les pacaedjes avou l' åbe des categoreyes sol hintche."
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Vos ploz vey des informåcions so on pacaedje tot clitchant so s' no el "
 "djivêye di droete."
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 "Po-z asteler, mete a djoû ou co oister on pacaedje, i vs sufixh di clitchî "
 "so s' boesse a clitchî."
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Aroke moirt"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "I gn a-st avou èn aroke moirt: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Tårdjîz on pô, s' i vs plait"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Astalaedje do pacaedje..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Inicialijhaedje..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "Acertinaedje"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1514,12 +1952,13 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Sopoirts di metaedjes a djoû k' egzistèt ddja"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1535,12 +1974,13 @@ msgstr ""
 "\n"
 "Poy, renondez %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kimint tchoezi manuwelmint vosse muroe"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1554,56 +1994,73 @@ msgstr ""
 "\n"
 "Poy, renondez %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "ezès discrijhaedjes"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Tårdjîz on pô s' i vs plait, dji cwir après les pacaedjes k' i gn a..."
 
-#: ../rpmdrake:1428
-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:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Tårdjîz on pô s' i vs plait, dji fwait l' djivêye des pacaedjes..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Tårdjîz on pô s' i vs plait, dji cwir après les pacaedjes k' i gn a..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Analijhant %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "candjmints:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Oister li *.%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Eployî li *.%s come mwaisse fitchî"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Èn rén fé"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "L' astalaedje a fini"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Analijhant..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Totes les pacaedjes dimandés ont stî astalés comifåt."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Åk n' a nén stî tins d' l' astalaedje"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1613,17 +2070,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Dji n' a nén savou prinde les pacaedjes sourdants."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Dji m' escuze, mins dji n' sai prinde les pacaedjes sourdants. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1635,68 +2093,74 @@ msgstr ""
 "Aroke(s) di rapoirté(s):\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Po satisfyî les aloyaedjes, li pacaedje shuvant va esse astalé:\n"
+"%2$s\n"
+msgstr[1] ""
 "Po satisfyî les aloyaedjes, les %d pacaedjes shuvants vont esse astalés:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Les pacaedjes ki shuvèt dvèt esse oistés po ds ôtes poleur esse metous a "
-"djoû:\n"
-"\n"
-"%s\n"
-"\n"
-"C' est bon di continouwer?"
-
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Inicialijhaedje..."
+#: ../rpmdrake:1926
+#, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Oister on pacaedje?"
+msgstr[1] "Oister %d pacaedjes?"
 
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Astalaedje do pacaedje..."
+#: ../rpmdrake:1927
+#, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"Les pacaedjes ki shût doet esse oisté po ds ôtes poleur esse metous a "
+"djoû:"
+msgstr[1] ""
+"Les pacaedjes ki shuvèt dvèt esse oistés po ds ôtes poleur esse metous a "
+"djoû:"
 
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Tårdjîz on pô, s' i vs plait"
+#: ../rpmdrake:1927
+#, c-format
+msgid "Is it ok to continue?"
+msgstr "C' est bon di continouwer?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Candjî di sopoirt"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Metoz l' sopoirt lomé «%s» dins l' lijheu [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Aberwetant l' pacaedje «%s» (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Verifiaedje des sinateures des pacaedjes..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Adviertixhmint"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1710,12 +2174,13 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "L' astalaedje a fwait berwete"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1727,25 +2192,28 @@ msgstr ""
 "\n"
 "Vos dvoz motoit mete a djoû vosse båze di dnêyes des sopoirts."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Dj' aprestêye les pacaedjes po l' astalaedje..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Dj' aprestêye..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "dji n' sai aveur accès å fitchî rpm [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1758,33 +2226,48 @@ msgstr ""
 "avou « .rpmnew » ou « .rpmsave » come cawete, vos les dvrîz\n"
 "rloukî po decider cwè fé avou zels:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr "Informåcion di metaedje a djoû"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "Ces pacaedjes vinèt avou des informåcions sol metaedje a djoû"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
-msgstr "Pus d' informåcions sol pacaedje... [%s]"
+#: ../rpmdrake:2083
+#, c-format
+msgid "Upgrade information about this package"
+msgstr "Informåcions di metaedje a djoû pol pacaedje"
+
+#: ../rpmdrake:2086
+#, c-format
+msgid "Upgrade information about package %s"
+msgstr "Informåcions di metaedje a djoû pol pacaedje %s"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Aroke"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Aroke moirt: nou pacaedje n' a stî trové po l' astalaedje."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Tårdjîz on pô s' i vs plait, rpm oistêye les pacaedjes..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Åk n' a nén stî tins do oistaedje"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1794,11 +2277,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Bénvnowe"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1810,8 +2295,8 @@ msgstr ""
 "Ciste usteye chal vos aidrè a tchoezi kés programes ki vos vloz dizastaler "
 "di vosse copiutrece."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1823,11 +2308,13 @@ msgstr ""
 "Ciste usteye chal vos aidrè a tchoezi les metaedjes a djoû ki vos vloz "
 "astaler sol copiutrece da vosse."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Bénvnowe a l' usteye d' astalaedje des programes!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1841,172 +2328,213 @@ 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:102
-msgid "Mandriva Linux Update"
-msgstr "Metaedjes a djoû di Mandriva Linux"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "Metaedje a djoû des programes"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Metaedjes a djoû di Mandriva Linux"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Dinez vos informåcions po-z aveur accès å procsi\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "No d' uzeu:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Oistaedje des pacaedjes di programes"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "Metaedje a djoû des pacaedjes di programes"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Astalaedje des pacaedjes di programes"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Neni"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Oyi"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Informåcions..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Otriche"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Ostraleye"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Beldjike"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Braezi"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Swisse"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Tchekeye"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Almagne"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Daenmåtche"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Grece"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Espagne"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Finlande"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "France"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Hongreye"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Israyel"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Itåleye"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Djapon"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Corêye"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Olande"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Norvedje"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Pologne"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Rûsseye"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Suwede"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Singapour"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Eslovakeye"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Rweyôme-Uni"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Chine"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Estats Unis"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2018,7 +2546,8 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2031,27 +2560,30 @@ msgstr ""
 "\n"
 "C' est bon di continouwer?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "Tchoezi l' muroe"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 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:536
+#: ../rpmdrake.pm:535
+#, c-format
 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."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Åk n' a nén stî tot-z aberwetant"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2066,7 +2598,7 @@ msgstr ""
 "Rissayîz ene miete pus tård."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2082,14 +2614,17 @@ msgstr ""
 "Rissayîz ene miete pus tård."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Nou muroe"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Dji n' sai trover nou muroe."
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2104,65 +2639,70 @@ msgstr ""
 "djoû oficirs di Mandriva Linux."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Tchoezixhoz li muroe ki vos vloz, s' i vs plait."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Dji copeye li fitchî pol sopoirt «%s»..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Dji corwaite li fitchî pol sopoirt «%s»..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Dji corwaite li fitchî då lon pol sopoirt «%s»..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " fwait."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " a fwait berwete!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s do sopoirt %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Dj' atake l' aberwetaedje di «%s»..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr ""
 "Aberwetaedje di «%s»,\n"
 "tins ki dmeure:%s, roedeu:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Aberwetaedje di «%s», roedeu:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "Åk n' a nén stî tot prindant les pacaedjes"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2177,31 +2717,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:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Mete a djoû les sopoirts"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 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:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Tchoezixhoz les sopoirt(s) ki vos vloz mete a djoû:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Tchoezi ttafwait"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Mete a djoû"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2213,8 +2753,8 @@ msgstr ""
 "Arokes:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2224,16 +2764,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Dji n' sai askepyî l' sopoirt."
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "Åk n' a nén stî tot radjoutant l' sopoirt"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2243,8 +2785,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2254,8 +2796,8 @@ msgstr ""
 "modêye di %s en alaedje pol moumint (%s).\n"
 "Ci sopoirt la serè dismetou."
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2265,11 +2807,13 @@ msgstr ""
 "modêye di Mandriva Linux en alaedje pol moumint (%s).\n"
 "Ci sopoirt la serè dismetou."
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Aidance enondêye come bouye di fond"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2545,21 +3089,22 @@ msgstr "Oister des programes"
 msgid "Software Media Manager"
 msgstr "Manaedjeu des sopoirts d' astalaedje"
 
+#~ 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..."
+
+#~ msgid "About Rpmdrake"
+#~ msgstr "Åd fwait di Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Nou pacaedje n' a stî trové po l' 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"
 
@@ -2581,9 +3126,6 @@ msgstr "Manaedjeu des sopoirts d' astalaedje"
 #~ msgid "Keys"
 #~ msgstr "Clés"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/_Vey"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dcb18f5e..58fdfc1c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,19 +12,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-09-18 22:49+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "选择介质类型"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -44,16 +47,18 @@ msgstr ""
 "但\n"
 "您需要分两步完成。)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "发行版介质源"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "官方更新"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -70,329 +75,406 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "正在添加介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "添加一个介质"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "本机文件"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "路径:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC 服务器"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP 服务器"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "路径或挂载点:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "路径或挂载点:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "浏览..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "综合文件/hdlist 的相对路径:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "如果留空, 将会自动探测综合文件/hdlist"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "名称:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "创建整个发行版的介质"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "在此介质中搜索更新"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "您至少要填写头两项。"
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr "已经有该名称的介质，您真的想要替换吗?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "添加一个介质:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "介质类型:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "软件包安装的全局选项"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "总是"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "从不"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "校验要安装的 RPM:"
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "要使用的下载程序:"
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "删除源"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "您真的想要删除源“%s”吗?"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "正在删除介质，请稍候..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "编辑介质"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "编辑介质“%s”:"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "保存修改"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "代理服务器..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "您必须插入介质才能继续"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "要保存更改，您必须在驱动器中插入介质。"
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "配置代理服务器"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "介质“%s”的代理服务器设置"
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "全局代理服务器设置"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, 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:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "代理服务器主机名:"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "在登录代理服务器时，您可能要指定用户名和密码:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "用户名:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "添加并行组"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "编辑并行组"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "添加一个介质限制"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "在介质限制中选择介质进行添加:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "添加主机"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "输入要添加的主机名或 IP 地址:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "编辑并行组“%s”:"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "组名称:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "协议:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "介质限制:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "添加"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "删除"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "主机:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "配置并行 urpmi(urpmi 的分布式执行)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "组"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "介质限制"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "协议"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "介质限制"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "命令"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(无)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "编辑"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "添加..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理软件包数字签名的密钥"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "介质"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "密钥"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "没有找到名称，密钥在 rpm 密钥环中不存在!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "添加密钥"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "选择要添加到介质 %s 中的密钥"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "关闭"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "删除密钥"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -400,32 +482,38 @@ msgstr ""
 "您真的想要从介质 %2$s 中删除密钥 %1$s 吗?\n"
 "(密钥名称: %3$s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "添加密钥..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "删除密钥"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "配置介质"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "启用?"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "更新?"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "此介质需要更新才能使用。现在更新吗？"
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -435,32 +523,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "添加自定义..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "更新..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "管理密钥..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "并行..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "全局选项..."
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -470,7 +564,8 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -483,7 +578,8 @@ msgstr ""
 "本工具将帮助您配置要在您的电脑上使用的软件包介质。这些介质将在安装新\n"
 "软件包或执行更新时使用。"
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -493,12 +589,13 @@ msgstr ""
 "软件包数据库已锁定。请关闭其它使用软件包数据库的应用程序(您是否有其它介质管理"
 "器或其它桌面，或者您正在安装软件包？)。"
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "无法添加介质，给出的参数有错或者不够"
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -507,8 +604,8 @@ msgstr ""
 "您即将添加新的软件包介质 %s。\n"
 "这意味着您可以从新介质中向系统添加新的软件包。"
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -517,81 +614,95 @@ msgstr ""
 "您即将添加新的软件包介质“%s”。\n"
 "这意味着您可以从新介质中向系统添加新的软件包。"
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "成功添加了介质 %s。"
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "成功添加了介质“%s”。"
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "用法：%s [选项]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr "  --changelog-first      描述窗口中更改日志排在文件列表之前"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=介质1,..       限制使用指定的介质"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     合并找到的全部 .rpmnew/.rpmsave 文件"
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=模式            设定模式(安装(默认)、删除、更新)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      更新模式中不询问第一个确认问题"
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      启动时不更新介质"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        不校验软件包签名"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 "  --parallel=别名,主机   在并行模式中使用[别名]组和[主机]来显示所需的依赖关系"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=包1,..     只显示这些软件包"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=包1,..       预先选择这些软件包"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 强制以 root 身份运行"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=包            搜索“包”"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "以用户模式运行"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -601,545 +712,784 @@ msgstr ""
 "您将无法执行对系统的修改，\n"
 "但您仍然可以浏览已有数据库。"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "辅助功能"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "归档"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "备份"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "光盘刻录"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "压缩"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "其它"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "书籍"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "计算机图书"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "常见问题解答"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "文献"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "簇"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "信息传递"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "查询服务"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "通讯"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "数据库"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "开发"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME 和 GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE 和 Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "内核"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "编辑器"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "教育"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "模拟器"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "文件工具"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "游戏"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "探险"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "街机"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "棋盘"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "卡"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "拼图"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "运动"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "策略"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "图形桌面"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "基于 FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "图形"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "监视"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "多媒体"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "视频"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "网络"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "聊天"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "文件传送"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "即时通讯"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "邮件"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "新闻"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "远程访问"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "办公"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "公钥"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "出版"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "科学"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "天文"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "生物"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "化学"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "计算机科学"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "地球科学"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "数学"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "物理"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shell"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "声音"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "系统"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "基本"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "配置"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "启动和初始化"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "打包"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "打印"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "部署"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "部署"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "控制台"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "TrueType"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 位图"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "国际化"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "内核和硬件"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "库"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "服务器"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "终端"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "文本工具"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "玩具"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "工作站"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "控制台工具"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "文档"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "游戏机"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Internet 工作站"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "多媒体工作站"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "网络计算机(客户端)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "办公工作站"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "图形环境"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME 工作站"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "IceWM 桌面"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE 工作站"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "其它图形桌面"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "服务器"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "数据库"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "防火墙/路由器"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "网络计算机服务器"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(不可用)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "正在搜索，请稍候..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "可添加"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "软件管理器"
+
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr ""
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "未选中"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "可添加"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "选中"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "未选中"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "重要性:"
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "更新原因:"
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "安全通报"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "无描述"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "文件:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "更新日志:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "文件:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "介质:"
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "当前安装的版本:"
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "名称:"
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "架构: "
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "大小: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "摘要:"
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "描述:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "软件管理器"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "该软件包的更多信息..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "需要下列软件包之一:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1148,34 +1498,41 @@ msgstr ""
 "更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
 "或者您已经安装了全部更新。"
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "更多信息"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "该软件包的信息"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "为了满足所有的依赖关系，需要删除下列软件包:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1183,7 +1540,8 @@ msgstr ""
 "对不起，删除这些软件包将可能毁坏您的系统:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1192,11 +1550,13 @@ msgstr ""
 "由于软件包之间的依赖关系，您不可以选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1205,129 +1565,159 @@ msgstr ""
 "为满足依赖关系，还需要安装下列软件包:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (属于跳过列表)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "有些软件包无法安装"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "有些软件包无法安装"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "对不起，不能选择下列软件包:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "选中软件: %s / 剩余磁盘空间: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "选中大小: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "此软件包的描述不可用\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "发生了一个致命错误: %s。"
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "已安装"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "未安装"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s 精选"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux 精选"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "全部软件包，按字母次序排列"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "全部软件包，按照是否可更新排列"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "全部软件包，按大小排列"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "全部软件包，按选中状态排列"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "不分类，按安装日期排列"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "全部软件包，按组别排列"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "全部更新"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "安全更新"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "安全更新"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "在文件名中"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "错误：%s 似乎是以只读方式挂载的。"
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "您需要先选中一些软件包。"
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1341,129 +1731,171 @@ msgstr ""
 "\n"
 "您真的想要安装所有选中的软件包吗?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/更新介质(_U)"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/重置选中内容(_R)"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/重新装入软件包清单(_P)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/退出(_Q)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/介质管理器(_M)"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/自动显示选中的软件包(_S)"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/报告错误(_R)"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/关于(_A)..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "关于 Rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake 是 Mandriva Linux 的软件包管理工具。"
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "全选"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "应用"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "简介"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "您可以使用左侧的类别树浏览软件包。"
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr "单击右侧列表中的软件包可以查看其信息。"
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr "要安装、更新或删除软件包，只需单击相应的复选框。"
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "发生了一个致命错误: %s。"
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "请稍候"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "软件包安装..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "正在初始化..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "确认"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1475,12 +1907,13 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "更新介质已经存在"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1495,12 +1928,13 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手工选择您的镜像"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1513,56 +1947,73 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "在描述中"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "正在读取软件包数据库，请稍候..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "正在列出软件包，请稍候..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "更改:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "检查..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1572,17 +2023,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1594,67 +2046,73 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "为了满足依赖性要求，将另外安装以下%d个软件包:\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "删除密钥"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
+"要升级其它软件包，必须删除下列软件包:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
+"确定继续吗?"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
 msgstr ""
-"要升级其它软件包，必须删除下列软件包:\n"
-"\n"
 "%s\n"
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "正在初始化..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "软件包安装..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "请稍候"
-
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1668,12 +2126,13 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1685,25 +2144,28 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件 [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1715,33 +2177,48 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, c-format
+msgid "Upgrade information"
+msgstr ""
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "该软件包的更多信息..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "该软件包的更多信息...[%s]"
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1751,11 +2228,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1766,8 +2245,8 @@ msgstr ""
 "\n"
 "本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1778,11 +2257,13 @@ msgstr ""
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "欢迎使用软件安装工具!"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1795,172 +2276,213 @@ msgstr ""
 "您的 Mandriva Linux 的安装光盘包含有数千个软件包。\n"
 "本工具将帮助您选择要为您的电脑安装的软件包。"
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux 更新"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "软件更新"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux 更新"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "请输入您访问代理服务器的细节\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "用户名："
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "软件包更新"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "信息..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "捷克共和国"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "德国"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "丹麦"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "希腊"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "法国"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "意大利"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "韩国"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "波兰"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "美国"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1972,7 +2494,8 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1984,25 +2507,28 @@ msgstr ""
 "\n"
 "确定继续吗?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "镜像选择"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "请稍候，正在下载镜像地址。"
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "正在从 Mandriva 网站下载镜像站点的地址，请稍候。"
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "下载出错"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2017,7 +2543,7 @@ msgstr ""
 "请稍后再试。"
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2032,14 +2558,17 @@ msgstr ""
 "请稍后再试。"
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "无镜像"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "找不到适合的任何镜像。"
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2052,63 +2581,68 @@ msgstr ""
 "官方更新所支持。"
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在复制介质“%s”的文件..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在检查介质“%s”的文件..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在检查介质“%s”的远程文件..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " 失败!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "介质 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在开始下载“%s”..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下载“%s”，剩余时间: %s，速度: %s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下载“%s”，速度: %s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "正在更新介质，请稍候..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "获取软件包出错"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2121,29 +2655,29 @@ msgstr ""
 "管理器中删除此介质，然后重新添加以进行重新配置。另外一种情况可能是，该介质目"
 "前不可用，您应该稍后再试。"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "更新介质"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "未找到活动的介质。您必须启用某些介质才能进行更新。"
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "选择您想要更新的介质:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "全选"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2155,8 +2689,8 @@ msgstr ""
 "错误如下:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2166,16 +2700,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "添加介质失败"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2185,8 +2721,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2195,8 +2731,8 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 %s 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2205,11 +2741,13 @@ msgstr ""
 "您用于更新的介质“%s”与您正在运行的 Mandriva Linux 版本(%s)不匹配。\n"
 "该介质将被禁用。"
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "正在后台调用帮助"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "已经启动帮助窗口，稍后桌面上将会出现。"
@@ -2483,3 +3021,6 @@ msgstr "删除软件"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
+
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "正在读取软件包数据库，请稍候..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f3a5bbd0..ec7daf8e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2006-09-18 22:52+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -29,12 +29,15 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../edit-urpm-sources.pl:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr "選擇媒體類型"
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -53,16 +56,18 @@ msgstr ""
 "來源 (通常是標準安裝光碟裡面的所有內容)，或者您可以選擇提供您使用的散佈套件\n"
 "官方更新的套件來源。(您可以兩項都加入，但是您必須重複這個步驟兩次。)"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr "散佈來源"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Official updates"
 msgstr "官方更新"
 
-#: ../edit-urpm-sources.pl:92
-#, perl-format
+#: ../edit-urpm-sources.pl:97
+#, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -79,84 +84,104 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../edit-urpm-sources.pl:102
+#: ../edit-urpm-sources.pl:111
+#, c-format
 msgid "Please wait, adding media..."
 msgstr "請稍後，新增媒體中..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "新增一個媒體"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "本地端檔案"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "路徑："
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP 伺服器"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:148
+#, c-format
 msgid "RSYNC server"
 msgstr "RSYNC 伺服器"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP 伺服器"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "路徑或是掛載點："
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "可移除裝置"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "路徑或是掛載點："
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "瀏覽..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "登入："
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "密碼："
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist 檔案的相對路徑："
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "若留下空白，程式將自動尋找 synthesis/hdlist "
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "名稱："
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr "建立一個適用於所有散佈套件的媒體"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
+#, c-format
 msgid "Search this media for updates"
 msgstr "在這個媒體中搜尋更新"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "您至少需要輸入前面兩個項目。"
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -164,109 +189,132 @@ msgstr ""
 "這個媒體的名稱已經存在了，\n"
 "您確定要置換原本項目嗎？"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "正在新增一個媒體："
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "媒體類別："
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
+#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
+#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
+#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
+#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
+#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
+#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
+#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
+#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
+#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
+#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
+#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
+#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:321
+#, c-format
 msgid "Global options for package installation"
 msgstr "關於套件安裝的全域選項"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "總是"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "絕不"
 
-#: ../edit-urpm-sources.pl:324
+#: ../edit-urpm-sources.pl:333
+#, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "驗證要安裝的 RPM 套件檔案："
 
-#: ../edit-urpm-sources.pl:325
+#: ../edit-urpm-sources.pl:334
+#, c-format
 msgid "Download program to use:"
 msgstr "要使用的下載程式："
 
-#: ../edit-urpm-sources.pl:355
+#: ../edit-urpm-sources.pl:364
+#, c-format
 msgid "Source Removal"
 msgstr "移除套件來源"
 
-#: ../edit-urpm-sources.pl:356
-#, perl-format
+#: ../edit-urpm-sources.pl:365
+#, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "您確定要移除套件來源 \"%s\" 嗎？"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "請稍候，正在移除媒體..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "編輯媒體"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "編輯媒體 \"%s\"："
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "儲存變更"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "代理伺服器..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "您需要置入媒體以便繼續"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "為了儲存變更，您需要在磁碟機置入該媒體。"
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "設定代理伺服器"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "媒體 \"%s\" 的代理伺服器設定"
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr "全域代理伺服器設定"
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -274,138 +322,172 @@ msgstr ""
 "如果您需要透過代理伺服器連線，請輸入該主機的名稱與通訊埠號 (語法：<proxyhost "
 "[:port]> 例如 proxy.hinet.net:80)："
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "代理伺服器主機名稱："
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "您需要指定用於代理伺服器認證的使用者帳號及密碼："
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "使用者："
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "新增同步管理群組"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "編輯同步管理群組"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "新增一媒體限定"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "選取要加入媒體限定中的媒體："
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "新增主機"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "請輸入要新增的主機名稱或 IP 位址："
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "編輯同步管理群組 \"%s\"："
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "群組名稱："
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "通訊協定："
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "媒體限定："
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "新增"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "移除"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "主機："
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "設定同步管理 urpmi (分散式執行的 urpmi)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "群組"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "媒體限定"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "媒體限定"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "指令"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(無)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
 msgstr "編輯"
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "新增..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理數位套件簽章鑰匙"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "媒體"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "鑰匙"
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "沒有找到名稱，鑰匙不存在於 rpm 鑰匙圈中！"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "新增一把鑰匙"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "選擇一把要新增到媒體 %s 的鑰匙"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "關閉"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "移除一把鑰匙"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -413,32 +495,38 @@ msgstr ""
 "您確定要由媒體 %2$s 移除鑰匙 %1$s ？\n"
 "(鑰匙名稱： %3$s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "新增一把鑰匙..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "移除鑰匙"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "設定媒體"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "是否啟用？"
 
-#: ../edit-urpm-sources.pl:917
+#: ../edit-urpm-sources.pl:935
+#, c-format
 msgid "Updates?"
 msgstr "自動更新來源？"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "此媒體需要更新才能使用。現在要更新嗎？"
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
@@ -448,32 +536,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:1015
+#, c-format
 msgid "Add custom..."
 msgstr "新增自訂..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "更新..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "管理鑰匙..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "同步管理..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr "全域選項"
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "輔助說明"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -483,7 +577,8 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -496,7 +591,8 @@ msgstr ""
 "此工具將會協助您設定想要用於系統上的套件媒體來源。\n"
 "他們將會被用來安裝新的軟體套件或執行更新。"
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -506,12 +602,13 @@ msgstr ""
 "套件資料庫被鎖定了。請關閉其它使用到套件資料庫的程式 (您是否\n"
 "在其他工作區有其它的媒體管理程式，或者您正在安裝套件呢？)"
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "無法新增媒體，遺失或錯誤的參數"
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
 "That means you will be able to add new software packages\n"
@@ -520,8 +617,8 @@ msgstr ""
 "您正要新增新的套件媒體 %s。\n"
 "那表示您將可以由新的媒體安裝新的軟體套件到您的系統上。"
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, c-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"
@@ -530,54 +627,62 @@ msgstr ""
 "您正要新增一個新的套件媒體 `%s'。\n"
 "那表示您將可以由這個新的媒體安裝新的軟體套件到您的系統上。"
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr "成功的新增了媒體 %s。"
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr "成功的新增了媒體 `%s'。"
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "用法：%s [選項]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr "  --changelog-first      在描述視窗中先顯示更新資訊再顯示檔案列表"
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     限制於給定的媒體"
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     計畫合併所有找到的 .rpmnew/.rpmsave 檔案"
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=MODE            設定模式 (install (預設值)、remove、update)"
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      在升級模式時不詢問第一個確認問題"
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      啟動時不更新媒體"
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        不驗證套件簽章"
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
@@ -585,27 +690,33 @@ msgstr ""
 "  --parallel=alias,host  在同步管理模式下，使用 \"alias\" 別名群組或 \"host"
 "\" 主機名稱來顯示相依性"
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    僅顯示這些套件"
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      預先選取這些套件"
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 強制使用 root 來執行"
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           搜尋 \"pkg\" "
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "以一般使用者模式執行"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -615,545 +726,784 @@ msgstr ""
 "您無法對系統進行修改，\n"
 "但是您仍然可以瀏覽現存的資料庫。"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "輔助功能"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "歸檔"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "備份"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "光碟燒錄"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "壓縮"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "書籍"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "電腦書籍"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "常見問題集"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Howtos"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "文獻"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr "叢集"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr "傳遞訊息中"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr "查詢服務"
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "通訊"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "資料庫"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
+#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#, c-format
 msgid "Development"
 msgstr "開發"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME 與 GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE 與 Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "核心"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "編輯器"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "教育"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "模擬器"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "檔案工具"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "遊戲"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "冒險遊戲"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "大型電玩"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "棋盤遊戲"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "卡片遊戲"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "益智遊戲"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "運動遊戲"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "戰略遊戲"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "圖形化桌面"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "以 FVWM 為基礎的"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "圖形"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "監視"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "多媒體"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "視訊"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "網路"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "聊天"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "檔案傳輸"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "即時通訊"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "郵件"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "新聞群組"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "遠端存取"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "辦公軟體"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr "公鑰"
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "出版"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "科學"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "天文學"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "生物學"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "化學"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "計算機科學"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "地球科學"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "數學"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "物理"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Shells"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "音效"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
+#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
+#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
+#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
+#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
+#: ../rpmdrake:328
+#, c-format
 msgid "System"
 msgstr "系統"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "基本套件"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "設定"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "開機與 Init 初始"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "包裝"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "列印"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "部署"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "部署"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "字型"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "命令列"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "國際化"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "核心與硬體"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "函式庫"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "伺服器"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "終端機"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "文字工具"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "玩具"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "工作站"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Console 工具"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "文件檔案"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "遊戲平台"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "網際網路平台"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "多媒體平台"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "網路電腦 (客戶端)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "辦公軟體平台"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "圖形環境"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOME 工作站"
+
+#: ../rpmdrake:350
+#, c-format
+msgid "IceWm Desktop"
+msgstr "IceWM 桌面"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE 工作站"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "其他圖型桌面軟體"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "伺服器"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "資料庫軟體"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "防火牆/路由器"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "網路伺服器"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(無法使用)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "搜尋結果 (無)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "搜尋中，請稍候..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "可供加入"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "軟體套件管理程式"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "停止"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "可供更新"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "未選取"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "可供加入"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "已選取"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "未選取"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "重要性："
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "更新的原因："
 
-#: ../rpmdrake:647
+#: ../rpmdrake:688
+#, c-format
 msgid "Security advisory"
 msgstr "安全性建言"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "沒有描述"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "檔案 (_F)："
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "更新紀錄："
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "檔案 (_F)：\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "更新紀錄：\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "媒體："
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "目前已安裝的版本："
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "名稱："
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "版本："
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr "硬體平台："
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "大小："
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "摘要："
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "描述："
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-msgid "Software Management"
-msgstr "軟體套件管理程式"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "更多該套件的資訊..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "需要下列套件的其中之一："
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "請選擇"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "需要下列套件的其中之一："
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "排序套件中，請稍候..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "無更新"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, c-format
 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"
@@ -1162,34 +1512,41 @@ msgstr ""
 "更新的清單項目是空的。也許是安裝於您系統上的套件沒有可用的更新，\n"
 "或者您的系統已經全部安裝完畢了。"
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "更多資訊"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "套件資訊"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "一些額外的套件必須被移除"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "因為它們的相依性問題，以下的套件也需要移除： "
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "某些套件無法被移除"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1197,7 +1554,8 @@ msgstr ""
 "移除下面這些套件將會破壞您的系統，抱歉：\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1206,11 +1564,13 @@ msgstr ""
 "由於相依性的要求，下面的套件現在會取消選取以便於能夠繼續進行\n"
 "下去:\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "需要額外的套件"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1219,129 +1579,159 @@ msgstr ""
 "為了能夠滿足相依性的要求，下面的套件也必須一併安裝：\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (屬於略過的列表)"
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "某些套件無法被安裝"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "某些套件無法被安裝"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
 "抱歉，下列的套件無法選取：\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "必須移除某些套件"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "已選擇：%s / 可用磁碟空間：%s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "已選擇的大小：%d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr "這個套件沒有可用的說明\n"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "發生了一個致命的錯誤：%s。"
+
+#: ../rpmdrake:1171
+#, c-format
 msgid "Installed"
 msgstr "已安裝"
 
-#: ../rpmdrake:1057
+#: ../rpmdrake:1171
+#, c-format
 msgid "Non installed"
 msgstr "未安裝"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr "%s 個選項"
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux 分類"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "所有套件，依照字母順序排列"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "全部套件，依可供更新分類"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "所有套件，依大小排序"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "全部套件，依選取狀態分類"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "不分類，僅依安裝時間排序"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "所有套件，依照群組分類"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "All updates"
 msgstr "所有更新"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "安全性更新"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "臭蟲修正更新"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "一般更新"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "安全性更新"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "依名稱"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "依描述"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "依檔案名稱"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "錯誤：%s 似乎被掛載為唯讀模式。"
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "您必須先選擇一些套件。"
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "選取了太多套件"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1356,131 +1746,173 @@ msgstr ""
 "\n"
 "您確定要安裝全部選取的套件嗎?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/檔案 (_F)"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/更新媒體 (_U)"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/重新選取 (_R)"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/重新載入套件清單 (_P)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/離開 (_Q)"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/選項 (_O)"
 
-#: ../rpmdrake:1223
+#: ../rpmdrake:1357
+#, c-format
 msgid "/_Media Manager"
 msgstr "/軟體套件媒體管理程式 (_M)"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/顯示自動選取的套件 (_S)"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/輔助說明 (_H)"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/回報臭蟲 (_R)"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/關於... (_A)"
 
-#. nicer formatting
-#: ../rpmdrake:1236
-msgid "About Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
 msgstr "關於 Rpmdrake"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake 是 Mandriva Linux 的套件管理工具。"
 
-#: ../rpmdrake:1242
+#: ../rpmdrake:1376
+#, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Shiva Huang <shivahuang@gmail.com>\n"
 "You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "尋找："
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "搜尋"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "清除"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "全部選取"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "套用"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "結束"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr "快速導覽"
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "您可以藉由左側的分類樹來瀏覽軟體套件。"
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr "您可以藉由點擊右側清單中的軟體套件來看到它的資訊。"
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr "要安裝、升級或者移除一個軟體套件，請點擊它的 \"核取按鈕\"。"
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "致命的錯誤"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "發生了一個致命的錯誤：%s。"
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "請稍候"
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "套件安裝..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "初始化中..."
 
-#: ../rpmdrake:1368
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, c-format
 msgid "Confirmation"
 msgstr "確認"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1492,12 +1924,13 @@ msgstr ""
 "\n"
 "您要繼續嗎?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "更新媒體已存在"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-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"
@@ -1511,12 +1944,13 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手動選擇您需要的映射站台"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-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"
@@ -1529,56 +1963,73 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "依描述"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "正在讀取套件資料庫，請稍候..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "排序套件中，請稍候..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "正在檢查 %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "變更："
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "移除 .%s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 為主要檔案"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "不進行任何動作"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "安裝完成"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "檢查..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您要求的全部套件。"
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "安裝時發生問題"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1588,17 +2039,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "無法取得來源套件。"
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "無法取得來源套件，抱歉。%s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1610,67 +2062,73 @@ msgstr ""
 "錯誤報告：\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
 "為了滿足相依性的需求，下面的 %d 個套件也必須一併安裝：\n"
 "%s\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "移除一把鑰匙"
+
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "The following package has to be removed for others to be upgraded:"
+msgid_plural ""
+"The following packages have to be removed for others to be upgraded:"
+msgstr[0] ""
 "下列的套件需要移除以便於其他套件的更新：\n"
 "\n"
 "%s\n"
 "\n"
 "您確定要繼續嗎？"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "初始化中..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "套件安裝..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "請稍候"
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"您要繼續嗎？"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "變更媒體"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請置入名為 \"%s\" 的媒體於裝置 [%s] 中"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下載套件 `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "核對套件簽章..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1684,12 +2142,13 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1701,25 +2160,28 @@ msgstr ""
 "\n"
 "您或許需要更新您的媒體資料庫。"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "正在準備套件安裝..."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../rpmdrake:1874
+#: ../rpmdrake:2065
+#, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1731,33 +2193,48 @@ msgstr ""
 "有些設定檔被建立時以 `.rpmnew' 或 `.rpmsave' 命名，您\n"
 "現在可以檢查一下以確保它正常運作："
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "一般資訊"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr "這些套件包含了升級資訊"
 
-#: ../rpmdrake:1896
-#, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
+msgstr "更多該套件的資訊..."
+
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
 msgstr "更多 %s 套件的資訊..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "錯誤"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "無法回復的錯誤：抱歉，沒有找到可供安裝的套件。"
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在移除套件，請稍候..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "移除時發生問題"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1767,11 +2244,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1782,8 +2261,8 @@ msgstr ""
 "\n"
 "此工具將協助您選取要從系統移除的軟體。"
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1794,11 +2273,13 @@ msgstr ""
 "\n"
 "此工具將協助您選取要安裝於系統上的更新。"
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "歡迎使用軟體安裝工具！"
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1812,172 +2293,213 @@ msgstr ""
 "套件都位於 CD 或 DVD 光碟內。此工具將會協助您選取您想\n"
 "要安裝於系統的軟體。"
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux 更新"
-
-#: ../rpmdrake.pm:102
+#: ../rpmdrake.pm:104
+#, c-format
 msgid "Software Update"
 msgstr "軟體升級"
 
-#: ../rpmdrake.pm:129
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux 更新"
+
+#: ../rpmdrake.pm:131
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "請輸入您的憑證以使用代理伺服器\n"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "用戶名稱："
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "軟體套件移除"
 
-#: ../rpmdrake.pm:174
+#: ../rpmdrake.pm:176
+#, c-format
 msgid "Software Packages Update"
 msgstr "軟體套件升級"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "軟體套件安裝"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "資訊..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "奧地利"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "澳洲"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "哥斯大黎加"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "捷克共和國"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "德國"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "希臘"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "法國"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "義大利"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "韓國"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "俄羅斯"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "台灣"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "英國"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "中國"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "美國"
 
-#: ../rpmdrake.pm:523
+#: ../rpmdrake.pm:521
+#, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -1989,7 +2511,8 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2001,25 +2524,28 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr "映射站台選擇"
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:534
+#, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "請稍候，正在取回映射站台位址。"
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "請稍候，正在由 Mandriva 網站取回映射站台位址。"
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "下載過程發生錯誤"
 
 #: ../rpmdrake.pm:544
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2034,7 +2560,7 @@ msgstr ""
 "請稍候再試。"
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2049,14 +2575,17 @@ msgstr ""
 "請稍候再試。"
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "無映射站台"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr "我找不到任何適合的映射站台。"
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2070,63 +2599,68 @@ msgstr ""
 "尚不支援您使用的處理器架構。"
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "請選取想要的映射站台。"
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "正在複製媒體 `%s' 的檔案..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "正在驗證媒體中的檔案 `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "正在驗證遠端媒體中的檔案 `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " 完成。"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " 失敗！"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "媒體 %2$s 中的 %1$s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "正在開始下載 `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "下載 `%s'，剩餘時間：%s，速率：%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "下載 `%s'，速率：%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "請稍候，更新媒體中..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr "接收套件時發生錯誤"
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-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"
@@ -2139,29 +2673,29 @@ msgstr ""
 "您必須使用軟體套件媒體管理員來移除並重新加入這個媒體來重新設定；或者\n"
 "是因為這個媒體現在無法聯繫上，請您稍待一會再試試看。"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "更新媒體"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr "找不到有作用的媒體。您必須啟動這些媒體後才能進行更新。"
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "請選擇您要更新的媒體："
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "全部選取"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2173,8 +2707,8 @@ msgstr ""
 "錯誤：\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
@@ -2184,16 +2718,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "無法建立媒體。"
 
-#: ../rpmdrake.pm:840
+#: ../rpmdrake.pm:836
+#, c-format
 msgid "Failure when adding medium"
 msgstr "新增媒體時發生錯誤"
 
-#: ../rpmdrake.pm:841
-#, perl-format
+#: ../rpmdrake.pm:837
+#, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2203,8 +2739,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
@@ -2213,8 +2749,8 @@ msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 %s 版本 (%s) 不符。\n"
 "它將會被停用。"
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
@@ -2223,11 +2759,13 @@ msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 Mandriva Linux 版本 (%s) 不符。\n"
 "它將會被停用。"
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "於背景啟動說明"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr "說明視窗已經啟動，它將馬上出現於您的桌面。"
@@ -2502,21 +3040,18 @@ msgstr "移除軟體"
 msgid "Software Media Manager"
 msgstr "軟體套件媒體管理員"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "正在讀取套件資料庫，請稍候..."
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "沒有找到可供安裝的套件。"
 
-#~ msgid "Stop"
-#~ msgstr "停止"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "全部套件，依媒體分類"
 
-#~ msgid "Normal information"
-#~ msgstr "一般資訊"
-
 #~ msgid "Maximum information"
 #~ msgstr "詳細資訊"
 
-- 
cgit v1.2.1